git://git.onelab.eu / sliver-openvswitch.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: adea354 2416b8e)
Merge "citrix" into "master".
authorBen Pfaff <blp@nicira.com>
Fri, 23 Oct 2009 00:43:28 +0000 (17:43 -0700)
committerBen Pfaff <blp@nicira.com>
Fri, 23 Oct 2009 00:43:28 +0000 (17:43 -0700)
commit3f355f47f8e7343e909ccfa854454d667baf3c38
tree21898eaab13a44cf3dadac0ff468a2f08d7df46atree | snapshot
parentadea354e28134f08008732062ef0c613954dc7e4commit | diff
parent2416b8eceae7b2508fe72efbc17d9cb71b69d330commit | diff
Merge "citrix" into "master".

This merge took a little bit of care due to two issues:

    - Crossport of "interface-reconfigure" fixes from master back to
      citrix that had happened and needed to be canceled out of the merge.

    - New script "refresh-xs-network-uuids" added on citrix branch that
      needed to be moved from /root/vswitch/scripts to
      /usr/share/vswitch/scripts.
12 files changed:
acinclude.m4 diff1 | diff2 | blob | history
configure.ac diff1 | diff2 | blob | history
datapath/datapath.c diff1 | diff2 | blob | history
datapath/datapath.h diff1 | diff2 | blob | history
datapath/dp_dev.c diff1 | diff2 | blob | history
ofproto/ofproto.c diff1 | diff2 | blob | history
utilities/ovs-ofctl.c diff1 | diff2 | blob | history
vswitchd/bridge.c diff1 | diff2 | blob | history
xenserver/README diff1 | diff2 | blob | history
xenserver/automake.mk diff1 | diff2 | blob | history
xenserver/usr_share_vswitch_scripts_refresh-xs-network-uuids | diff2 | blob | history
xenserver/vswitch-xen.spec diff1 | diff2 | blob | history
sliver-openvswitch