Merge "citrix" branch into "master.
authorBen Pfaff <blp@nicira.com>
Mon, 5 Oct 2009 17:29:07 +0000 (10:29 -0700)
committerBen Pfaff <blp@nicira.com>
Mon, 5 Oct 2009 17:29:07 +0000 (10:29 -0700)
commit4d678233e981fa319a338f6b0949e9dc625941a4
tree2555d8dd0c98234bde01a9646d252d5b87e93995
parent55bc65533fe868666f6ea8539f2a1b30da964abf
parent52df17e745d632757cd9594a34dc3c24522dd686
Merge "citrix" branch into "master.
lib/shash.c
ofproto/ofproto.c
vswitchd/bridge.c
vswitchd/ovs-vswitchd.conf.5.in
xenserver/etc_init.d_vswitch