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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 01d15d8 5eccf35)

author	Ben Pfaff <blp@nicira.com>
	Mon, 15 Jun 2009 23:04:54 +0000 (16:04 -0700)
committer	Ben Pfaff <blp@nicira.com>
	Mon, 15 Jun 2009 23:04:54 +0000 (16:04 -0700)
commit	34e63086edddcae06d7c1a4fa84fec0861e50758
tree	2db8f3f45d67648d2a7fc4cb245d1a0c18fd2cda	tree \| snapshot
parent	01d15d868f8df2232a31db761bcc14c500967bfd	commit \| diff
parent	5eccf359391f7fe2cdb0edbaaf5680895c115218	commit \| diff

Merge changes from citrix branch into master.

16 files changed:

datapath/brc_sysfs.h	diff1 \|	diff2 \|	blob \| history
datapath/brc_sysfs_dp.c	diff1 \|	diff2 \|	blob \| history
datapath/brc_sysfs_if.c	diff1 \|	diff2 \|	blob \| history
datapath/brcompat.c	diff1 \|	diff2 \|	blob \| history
datapath/datapath.c	diff1 \|	diff2 \|	blob \| history
datapath/datapath.h	diff1 \|	diff2 \|	blob \| history
lib/socket-util.c	diff1 \|	diff2 \|	blob \| history
lib/socket-util.h	diff1 \|	diff2 \|	blob \| history
lib/vconn-ssl.c	diff1 \|	diff2 \|	blob \| history
lib/vconn-stream.c	diff1 \|	diff2 \|	blob \| history
lib/vconn-tcp.c	diff1 \|	diff2 \|	blob \| history
lib/vconn-unix.c	diff1 \|	diff2 \|	blob \| history
lib/vconn.c	diff1 \|	diff2 \|	blob \| history
secchan/discovery.c	diff1 \|	diff2 \|	blob \| history
secchan/main.c	diff1 \|	diff2 \|	blob \| history
utilities/ovs-discover.c	diff1 \|	diff2 \|	blob \| history

sliver-openvswitch