Merge commit 'origin/citrix'
authorJustin Pettit <jpettit@nicira.com>
Sat, 5 Sep 2009 05:23:29 +0000 (22:23 -0700)
committerJustin Pettit <jpettit@nicira.com>
Sat, 5 Sep 2009 05:23:29 +0000 (22:23 -0700)
commit8398cf7efc3979cd6c8152915a584c13873ee322
treeaf44c62d6be2610c3d4b02e5e29536efaa546df7
parentc3a519b5c987a6213b65ff4c2fbc817ecd287fbe
parenta393b897f27405592dc56f7084796c8bf1815519
Merge commit 'origin/citrix'
datapath/datapath.c
lib/rconn.c
vswitchd/ovs-vswitchd.conf.5.in
xenserver/vswitch-xen.spec