Merge "master" branch into "db".
authorBen Pfaff <blp@nicira.com>
Wed, 2 Dec 2009 19:49:53 +0000 (11:49 -0800)
committerBen Pfaff <blp@nicira.com>
Wed, 2 Dec 2009 19:49:53 +0000 (11:49 -0800)
commit58fda1dab104041fc693032475ec4662c1a52849
treec6adcb818ad9233155d4d65872e8144dae6fe723
parentc3bb4bd7f1d9c045a5e5d7062b09d4dac4e48195
parent6c88d577e83db12f73df12be8fc575419b011fda
Merge "master" branch into "db".
19 files changed:
Makefile.am
configure.ac
extras/ezio/ovs-switchui.c
lib/dpif-netdev.c
lib/learning-switch.c
lib/lockfile.c
lib/netdev-linux.c
lib/poll-loop.c
lib/stream-tcp.c
lib/svec.c
lib/svec.h
lib/timeval.c
lib/unixctl.c
lib/vlog-modules.def
ofproto/in-band.c
ofproto/ofproto.c
utilities/ovs-dpctl.c
utilities/ovs-ofctl.c
vswitchd/bridge.c