Code Review / ovsdb.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(merge: ad691b3 23d2611)
Merge branch 'master' into topic/netvirtsbmerge 62/20062/1
authorSam Hague <shague@redhat.com>
Mon, 11 May 2015 22:28:19 +0000 (18:28 -0400)
committerSam Hague <shague@redhat.com>
Mon, 11 May 2015 22:28:31 +0000 (18:28 -0400)
commit6d423093e9b21fcfceaf6e9223bba8f9d2621c97
tree4ac16f36a3c90f6fe0f72c8bf9e83bd5829140d9tree | snapshot
parentad691b38162c87b06c80b64a16687dfd632042b8commit | diff
parent23d2611b2436695524d6b270f2189e3db471d246commit | diff
Merge branch 'master' into topic/netvirtsbmerge

Conflicts:
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java

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