Merge citrix branch into master.
authorJesse Gross <jesse@nicira.com>
Tue, 10 Nov 2009 23:12:01 +0000 (15:12 -0800)
committerJesse Gross <jesse@nicira.com>
Tue, 10 Nov 2009 23:12:01 +0000 (15:12 -0800)
commitd65349ea28bb67a0062a9b4b60ff97538206373b
tree4c8614cc35ac6fe654ff30916c39e25f93aa2bd1
parent01b528c1b7af38678f29a6b21c0bc220560c97f7
parentf2d7fd66cf51b83acbe509f8ef6d4b34538d0646
Merge citrix branch into master.
18 files changed:
INSTALL.Linux
datapath/datapath.c
extras/ezio/ovs-switchui.c
lib/dpif-linux.c
lib/vconn.c
ofproto/in-band.c
ofproto/netflow.c
ofproto/netflow.h
ofproto/ofproto.c
ofproto/ofproto.h
utilities/ovs-dpctl.c
utilities/ovs-ofctl.c
utilities/ovs-openflowd.c
vswitchd/bridge.c
vswitchd/ovs-vswitchd.8.in
vswitchd/ovs-vswitchd.conf.5.in
xenserver/opt_xensource_libexec_interface-reconfigure
xenserver/usr_share_vswitch_scripts_dump-vif-details