projects / cascardo / ovs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 62ee346 67a4917)
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
treeabea72de06ca718ef0296b88ee84a1bf889fed8ctree | snapshot
parent62ee3464d99c0e37f38b503321cd46181c5c7617commit | diff
parent67a4917b07031b387beafaedce413b4207214059commit | diff
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 diff1 | diff2 | blob | history
extras/ezio/ovs-switchui.c diff1 | diff2 | blob | history
extras/ezio/tty.c diff1 | diff2 | blob | history
lib/command-line.c diff1 | diff2 | blob | history
lib/compiler.h diff1 | diff2 | blob | history
lib/coverage.c diff1 | diff2 | blob | history
lib/dhcp-client.c diff1 | diff2 | blob | history
lib/dhcp.c diff1 | diff2 | blob | history
lib/dpif-linux.c diff1 | diff2 | blob | history
lib/dpif-netdev.c diff1 | diff2 | blob | history
lib/fatal-signal.c diff1 | diff2 | blob | history
lib/learning-switch.c diff1 | diff2 | blob | history
lib/netdev-linux.c diff1 | diff2 | blob | history
lib/netdev.c diff1 | diff2 | blob | history
lib/netdev.h diff1 | diff2 | blob | history
lib/packets.h diff1 | diff2 | blob | history
lib/process.c diff1 | diff2 | blob | history
lib/rconn.c diff1 | diff2 | blob | history
lib/shash.h diff1 | diff2 | blob | history
lib/socket-util.c diff1 | diff2 | blob | history
lib/stream-ssl.c diff1 | | blob | history
lib/stream-tcp.c diff1 | | blob | history
lib/stream-unix.c diff1 | | blob | history
lib/stream.c diff1 | | blob | history
lib/timeval.h diff1 | diff2 | blob | history
lib/unixctl.c diff1 | diff2 | blob | history
lib/util.c diff1 | diff2 | blob | history
lib/util.h diff1 | diff2 | blob | history
lib/vconn-stream.c diff1 | diff2 | blob | history
lib/vconn.c diff1 | diff2 | blob | history
lib/vlog.c diff1 | diff2 | blob | history
ofproto/discovery.c diff1 | diff2 | blob | history
ofproto/ofproto-sflow.c diff1 | diff2 | blob | history
ofproto/ofproto.c diff1 | diff2 | blob | history
ovsdb/execution.c diff1 | | blob | history
ovsdb/jsonrpc-server.c diff1 | | blob | history
ovsdb/ovsdb-client.c diff1 | | blob | history
ovsdb/ovsdb-idlc.in diff1 | | blob | history
ovsdb/ovsdb-server.c diff1 | | blob | history
ovsdb/ovsdb-tool.c diff1 | | blob | history
ovsdb/ovsdb.c diff1 | | blob | history
tests/test-dhcp-client.c diff1 | diff2 | blob | history
tests/test-jsonrpc.c diff1 | | blob | history
tests/test-ovsdb.c diff1 | | blob | history
tests/test-reconnect.c diff1 | | blob | history
tests/test-vconn.c diff1 | diff2 | blob | history
utilities/ovs-discover.c diff1 | diff2 | blob | history
utilities/ovs-dpctl.c diff1 | diff2 | blob | history
utilities/ovs-ofctl.c diff1 | diff2 | blob | history
utilities/ovs-vsctl.c diff1 | | blob | history
vswitchd/bridge.c diff1 | diff2 | blob | history
xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.