Code Review / ovsdb.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(merge: 4de6b80 58e83ca)
Merge branch 'master' into topic/netvirtsb_merge 50/19950/1
authorSam Hague <shague@redhat.com>
Fri, 8 May 2015 20:28:28 +0000 (16:28 -0400)
committerSam Hague <shague@redhat.com>
Fri, 8 May 2015 20:30:14 +0000 (16:30 -0400)
commit4da3721dcd9996af18fdefe3535f65b436efcce6
treef5450c567a2a3868823ad23d0280c179c0824efctree | snapshot
parent4de6b804cfe6f4812ca1be444e8b8a3ff8b6f3facommit | diff
parent58e83ca86374deb866ced488754dfa574fd9bd47commit | diff
Merge branch 'master' into topic/netvirtsb_merge

Conflicts:
southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java

Change-Id: Ieb1fe28a53b303e576cb060ff751cf02e1762ff0
Signed-off-by: Sam Hague <shague@redhat.com>
southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java diff1 | diff2 | blob | history
Open vSwitch Database Management Protocol