Merge branch 'master' into topic/netvirtsbmerge 60/20460/1 topic/netvirtsb
authorSam Hague <shague@redhat.com>
Fri, 15 May 2015 01:24:40 +0000 (21:24 -0400)
committerSam Hague <shague@redhat.com>
Fri, 15 May 2015 01:25:04 +0000 (21:25 -0400)
commitdcc9311c5de4a178ffe53c93959ac4e54da30c5f
tree89bc26ce27e26b2a3b317819774eafe23fb5a3b5
parentfbff755cb910e18238ba04bf01b760486fd1f4a5
parent8e14a9956d2d914a82f0fa3ab0a6666556cf05a2
Merge branch 'master' into topic/netvirtsbmerge

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

Change-Id: I46888c0d5ceb1dcdda559be194f7e09a0b902095
Signed-off-by: Sam Hague <shague@redhat.com>
southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java