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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: b308059 56fd8ed)

author	Ben Pfaff <blp@nicira.com>
	Mon, 25 Jan 2010 18:52:28 +0000 (10:52 -0800)
committer	Ben Pfaff <blp@nicira.com>
	Mon, 25 Jan 2010 18:52:28 +0000 (10:52 -0800)
commit	49c36903d6d65bed96cba31f05534510a21a68d7
tree	ffd8b53b6da72e0bc9aa7265eb296cd43669e57d	tree \| snapshot
parent	b3080599f6b280c63b9b6f4ca2d3c6006bcd9590	commit \| diff
parent	56fd8edf80b6098289f9ddd94a6a4be3be648472	commit \| diff

Merge "sflow" into "master".

No conflicts, but lib/dpif.c needed a few changes since struct dpif's
member "class" was renamed to "dpif_class" in master since sflow was
branched off.

configure.ac	diff1 \|	diff2 \|	blob \| history
datapath/datapath.c	diff1 \|	diff2 \|	blob \| history
datapath/datapath.h	diff1 \|	diff2 \|	blob \| history
lib/automake.mk	diff1 \|	diff2 \|	blob \| history
lib/dpif-provider.h	diff1 \|	diff2 \|	blob \| history
lib/dpif.c	diff1 \|	diff2 \|	blob \| history
lib/netdev.c	diff1 \|	diff2 \|	blob \| history
vswitchd/ovs-vswitchd.conf.5.in	diff1 \|	diff2 \|	blob \| history

sliver-openvswitch