Merge citrix branch into master.
authorBen Pfaff <blp@nicira.com>
Tue, 22 Sep 2009 17:17:44 +0000 (10:17 -0700)
committerBen Pfaff <blp@nicira.com>
Tue, 22 Sep 2009 17:17:44 +0000 (10:17 -0700)
commit576e26d7b47f4e53116ef0b5f035d260f426d37b
tree485a55122153924ae5255840cea787eec32b95ae
parent2a6cb303b0b9956952a1599092e64f5805ee741a
parent36becebea2d1e816a636d62a226521d0bf26bb18
Merge citrix branch into master.
17 files changed:
configure.ac
datapath/datapath.h
lib/automake.mk
lib/netdev-linux.c
lib/rconn.c
lib/vconn.c
ofproto/fail-open.c
ofproto/fail-open.h
ofproto/in-band.c
ofproto/ofproto.c
ofproto/pktbuf.c
ofproto/pktbuf.h
utilities/ovs-appctl.8.in
utilities/ovs-controller.8.in
vswitchd/bridge.c
vswitchd/ovs-brcompatd.c
xenserver/usr_sbin_xen-bugtool