Merge branch "partner", to simplify partner integration.
authorBen Pfaff <blp@nicira.com>
Mon, 15 Sep 2008 22:31:36 +0000 (15:31 -0700)
committerBen Pfaff <blp@nicira.com>
Mon, 15 Sep 2008 22:31:36 +0000 (15:31 -0700)
commitf593e3ab70ab06acbf97cbb0a9f897dc4f078011
treebc73a07e293d7a0a7f062e9c497cbb05fcfabf38
parent9c1b16772cfd8d346be89963ddf6a6d6a87f0cc9
parenta3d01200b1d94d54b6da7c34f6d56bd6da8465f4
Merge branch "partner", to simplify partner integration.
25 files changed:
controller/controller.c
include/Makefile.am
include/rconn.h
include/vconn-provider.h
include/vconn.h
lib/Makefile.am
lib/dpif.c
lib/learning-switch.c
lib/ofp-print.c
lib/rconn.c
lib/vconn-netlink.c
lib/vconn-ssl.c
lib/vconn-stream.c
lib/vconn-tcp.c
lib/vconn-unix.c
lib/vconn.c
secchan/secchan.c
switch/datapath.c
switch/datapath.h
switch/switch-flow.c
switch/switch.c
switch/table-hash.c
switch/table-linear.c
tests/test-stp.c
utilities/dpctl.c