Merge citrix branch into master.
authorBen Pfaff <blp@nicira.com>
Thu, 16 Jul 2009 18:54:37 +0000 (11:54 -0700)
committerBen Pfaff <blp@nicira.com>
Thu, 16 Jul 2009 18:54:37 +0000 (11:54 -0700)
commit3b01baa3970139c3a195017ab1ea3e42761e3db2
tree85ddc625b6a0a930b9e5cef44ab462e9de44f1cd
parent080ec396fd98fa6848295a7582c3fbfeb0a3589d
parent3c303e5fe1061b8715be018ae8e535cbc24303c9
Merge citrix branch into master.
26 files changed:
datapath/brcompat.c
datapath/datapath.c
datapath/datapath.h
datapath/dp_dev.c
extras/ezio/ovs-switchui.c
lib/netdev.c
lib/netdev.h
lib/rconn.c
lib/socket-util.c
lib/socket-util.h
lib/vconn-ssl.c
lib/vconn-stream.c
lib/vconn-tcp.c
lib/vconn-unix.c
lib/vconn.c
ofproto/executer.c
ofproto/in-band.c
ofproto/in-band.h
ofproto/ofproto.c
ofproto/ofproto.h
ofproto/status.c
utilities/ovs-ofctl.8.in
utilities/ovs-ofctl.c
vswitchd/bridge.c
vswitchd/ovs-brcompatd.8.in
vswitchd/ovs-vswitchd.conf.5.in