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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 2c7807a 0ad9b73)

author	Ben Pfaff <blp@nicira.com>
	Wed, 2 Sep 2009 17:14:53 +0000 (10:14 -0700)
committer	Ben Pfaff <blp@nicira.com>
	Wed, 2 Sep 2009 17:14:53 +0000 (10:14 -0700)
commit	f1acd62b54376a425a975f9af501c4c8c5689b39
tree	a579f967870b61d3a226acdc62cc079c8ce996d1	tree \| snapshot
parent	2c7807ac4f578bfdd7a46b79028935c9aa34cde3	commit \| diff
parent	0ad9b732910b8f1aa7fc47ea57ff79e7618a4e6d	commit \| diff

Merge citrix branch into master.

12 files changed:

datapath/datapath.c	diff1 \|	diff2 \|	blob \| history
datapath/datapath.h	diff1 \|	diff2 \|	blob \| history
extras/ezio/ovs-switchui.c	diff1 \|	diff2 \|	blob \| history
include/openvswitch/datapath-protocol.h	diff1 \|	diff2 \|	blob \| history
lib/netdev-linux.c	diff1 \|	\|	blob \| history
lib/netdev-provider.h	diff1 \|	\|	blob \| history
lib/netdev.c	diff1 \|	diff2 \|	blob \| history
lib/netdev.h	diff1 \|	diff2 \|	blob \| history
ofproto/in-band.c	diff1 \|	diff2 \|	blob \| history
ofproto/in-band.h	diff1 \|	diff2 \|	blob \| history
ofproto/ofproto.c	diff1 \|	diff2 \|	blob \| history
vswitchd/bridge.c	diff1 \|	diff2 \|	blob \| history

sliver-openvswitch