git.onelab.eu Git - sliver-openvswitch.git/commit

git://git.onelab.eu / sliver-openvswitch.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2a6cb30 36beceb)

author	Ben Pfaff <blp@nicira.com>
	Tue, 22 Sep 2009 17:17:44 +0000 (10:17 -0700)
committer	Ben Pfaff <blp@nicira.com>
	Tue, 22 Sep 2009 17:17:44 +0000 (10:17 -0700)
commit	576e26d7b47f4e53116ef0b5f035d260f426d37b
tree	485a55122153924ae5255840cea787eec32b95ae	tree \| snapshot
parent	2a6cb303b0b9956952a1599092e64f5805ee741a	commit \| diff
parent	36becebea2d1e816a636d62a226521d0bf26bb18	commit \| diff

Merge citrix branch into master.

17 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
datapath/datapath.h	diff1 \|	diff2 \|	blob \| history
lib/automake.mk	diff1 \|	diff2 \|	blob \| history
lib/netdev-linux.c	diff1 \|	\|	blob \| history
lib/rconn.c	diff1 \|	diff2 \|	blob \| history
lib/vconn.c	diff1 \|	diff2 \|	blob \| history
ofproto/fail-open.c	diff1 \|	diff2 \|	blob \| history
ofproto/fail-open.h	diff1 \|	diff2 \|	blob \| history
ofproto/in-band.c	diff1 \|	diff2 \|	blob \| history
ofproto/ofproto.c	diff1 \|	diff2 \|	blob \| history
ofproto/pktbuf.c	diff1 \|	diff2 \|	blob \| history
ofproto/pktbuf.h	diff1 \|	diff2 \|	blob \| history
utilities/ovs-appctl.8.in	diff1 \|	diff2 \|	blob \| history
utilities/ovs-controller.8.in	diff1 \|	diff2 \|	blob \| history
vswitchd/bridge.c	diff1 \|	diff2 \|	blob \| history
vswitchd/ovs-brcompatd.c	diff1 \|	diff2 \|	blob \| history
xenserver/usr_sbin_xen-bugtool	diff1 \|	diff2 \|	blob \| history

sliver-openvswitch