Merge citrix branch into master.
authorBen Pfaff <blp@nicira.com>
Wed, 18 Nov 2009 22:14:29 +0000 (14:14 -0800)
committerBen Pfaff <blp@nicira.com>
Wed, 18 Nov 2009 22:14:29 +0000 (14:14 -0800)
commitd17ee8689bff22541dccaa792b70a848641f3646
treecd5e8c939f4acc98695275590279b8bdf0d66b79
parent7c9e113b712e72fcb4ccc6075da7334cb3391059
parent0cd8a05ec036ca8f950d4d4034a80bf485581b6a
Merge citrix branch into master.
datapath/actions.c
ofproto/ofproto.c
vswitchd/bridge.c
xenserver/etc_init.d_vswitch
xenserver/etc_xensource_scripts_vif
xenserver/opt_xensource_libexec_interface-reconfigure