Merge "master" into "next".
authorBen Pfaff <blp@nicira.com>
Thu, 11 Feb 2010 19:11:23 +0000 (11:11 -0800)
committerBen Pfaff <blp@nicira.com>
Thu, 11 Feb 2010 19:11:23 +0000 (11:11 -0800)
commitc69ee87c10818267f991236201150b1fa51ae519
treeabea72de06ca718ef0296b88ee84a1bf889fed8c
parent62ee3464d99c0e37f38b503321cd46181c5c7617
parent67a4917b07031b387beafaedce413b4207214059
Merge "master" into "next".

The main change here is the need to update all of the uses of UNUSED in
the next branch to OVS_UNUSED as it is now spelled on "master".
52 files changed:
datapath/datapath.c
extras/ezio/ovs-switchui.c
extras/ezio/tty.c
lib/command-line.c
lib/compiler.h
lib/coverage.c
lib/dhcp-client.c
lib/dhcp.c
lib/dpif-linux.c
lib/dpif-netdev.c
lib/fatal-signal.c
lib/learning-switch.c
lib/netdev-linux.c
lib/netdev.c
lib/netdev.h
lib/packets.h
lib/process.c
lib/rconn.c
lib/shash.h
lib/socket-util.c
lib/stream-ssl.c
lib/stream-tcp.c
lib/stream-unix.c
lib/stream.c
lib/timeval.h
lib/unixctl.c
lib/util.c
lib/util.h
lib/vconn-stream.c
lib/vconn.c
lib/vlog.c
ofproto/discovery.c
ofproto/ofproto-sflow.c
ofproto/ofproto.c
ovsdb/execution.c
ovsdb/jsonrpc-server.c
ovsdb/ovsdb-client.c
ovsdb/ovsdb-idlc.in
ovsdb/ovsdb-server.c
ovsdb/ovsdb-tool.c
ovsdb/ovsdb.c
tests/test-dhcp-client.c
tests/test-jsonrpc.c
tests/test-ovsdb.c
tests/test-reconnect.c
tests/test-vconn.c
utilities/ovs-discover.c
utilities/ovs-dpctl.c
utilities/ovs-ofctl.c
utilities/ovs-vsctl.c
vswitchd/bridge.c
xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py