projects / cascardo / ovs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7679441 be9d0de)
Merge "master" into "ovn".
authorBen Pfaff <blp@nicira.com>
Sun, 14 Jun 2015 01:10:46 +0000 (18:10 -0700)
committerBen Pfaff <blp@nicira.com>
Sun, 14 Jun 2015 01:12:08 +0000 (18:12 -0700)
commit03ce866e44835e43f04747cfc65b2c592d780165
tree1353eac489829102874e88bf631966dbfe58523dtree | snapshot
parent767944131928487497579fd48a8a1efa0ca0d676commit | diff
parentbe9d0de7a40459507b0620bc7bc352f7b6b0942dcommit | diff
Merge "master" into "ovn".

This allows OVN to take advantage of the client scalability changes
that have been committed to ovsdb-server on master recently.

Conflicts:
Makefile.am
lib/learn.c
AUTHORS diff1 | diff2 | blob | history
Makefile.am diff1 | diff2 | blob | history
configure.ac diff1 | diff2 | blob | history
lib/json.c diff1 | diff2 | blob | history
lib/learn.c diff1 | diff2 | blob | history
lib/meta-flow.c diff1 | diff2 | blob | history
lib/util.c diff1 | diff2 | blob | history
lib/util.h diff1 | diff2 | blob | history
tests/test-ovn.c diff1 | | blob | history
Unnamed repository; edit this file 'description' to name the repository.