Merge changes from citrix branch into master.
authorBen Pfaff <blp@nicira.com>
Mon, 15 Jun 2009 23:04:54 +0000 (16:04 -0700)
committerBen Pfaff <blp@nicira.com>
Mon, 15 Jun 2009 23:04:54 +0000 (16:04 -0700)
commit34e63086edddcae06d7c1a4fa84fec0861e50758
tree2db8f3f45d67648d2a7fc4cb245d1a0c18fd2cda
parent01d15d868f8df2232a31db761bcc14c500967bfd
parent5eccf359391f7fe2cdb0edbaaf5680895c115218
Merge changes from citrix branch into master.
16 files changed:
datapath/brc_sysfs.h
datapath/brc_sysfs_dp.c
datapath/brc_sysfs_if.c
datapath/brcompat.c
datapath/datapath.c
datapath/datapath.h
lib/socket-util.c
lib/socket-util.h
lib/vconn-ssl.c
lib/vconn-stream.c
lib/vconn-tcp.c
lib/vconn-unix.c
lib/vconn.c
secchan/discovery.c
secchan/main.c
utilities/ovs-discover.c