Merge branch 'master' into topic/netvirtsb2 60/19160/1
authorSam Hague <shague@redhat.com>
Mon, 27 Apr 2015 14:54:37 +0000 (10:54 -0400)
committerSam Hague <shague@redhat.com>
Mon, 27 Apr 2015 15:15:16 +0000 (11:15 -0400)
commitf7cbe864b251aa70bff91bea476349727ca1a9ad
treed0cdc16a61876abcebcf2c489dff8870bc9391d0
parentc9a4ba2415328d10b766b26cf9ca5e7d987a726d
parentb8fae55d4357e5508eb4549b56d0555060f8c962
Merge branch 'master' into topic/netvirtsb2

Signed-off-by: Sam Hague <shague@redhat.com>
Conflicts:
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

Change-Id: I226c8118b399e60ef846d165a701f62873324739
Signed-off-by: Sam Hague <shague@redhat.com>
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbDataChangeListener.java
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