[ovs-dev] [branch-1.6 0/4] Backports from master.

[Ethan Jackson]

These patches all should be on branch-1.6.  The first 3 patches of
the series should have been cherry-picked at the time they were
merged to master (my oversight).  The first patch of the series, I
intend to backport further as it's a bug fix.

Ethan Jackson (4):
  bond: Incorrectly reported an error in appctl.
  jsonrpc: Don't swallow errors in jsonrpc_transact_block().
  unixctl: New JSON RPC back-end.
  ofproto-dpif: Log traces when resubmit depth is exceeded.

 lib/bond.c              |   42 ++--
 lib/cfm.c               |   10 +-
 lib/coverage.c          |    2 +-
 lib/jsonrpc.c           |    8 +-
 lib/lacp.c              |    4 +-
 lib/netdev-dummy.c      |    8 +-
 lib/stp.c               |    4 +-
 lib/stress.c            |   16 +-
 lib/timeval.c           |    7 +-
 lib/unixctl.c           |  603 +++++++++++++++++------------------------------
 lib/unixctl.h           |   17 +-
 lib/vlog.c              |   12 +-
 ofproto/ofproto-dpif.c  |  119 ++++++----
 ofproto/ofproto.c       |    2 +-
 ovsdb/automake.mk       |    2 +-
 ovsdb/ovsdb-client.c    |   43 ++--
 ovsdb/ovsdb-server.c    |    8 +-
 tests/automake.mk       |   44 ++--
 tests/test-netflow.c    |    2 +-
 tests/test-ovsdb.c      |    2 +-
 utilities/automake.mk   |   10 +-
 utilities/ovs-appctl.c  |   42 ++--
 utilities/ovs-ofctl.c   |   19 +-
 vswitchd/bridge.c       |   14 +-
 vswitchd/ovs-vswitchd.c |    2 +-
 25 files changed, 457 insertions(+), 585 deletions(-)

-- 
1.7.9.2