Merge branch 'master' into topic/master/neutron-yang-migration 35/26835/1
authorAnil Vishnoi <vishnoianil@gmail.com>
Fri, 11 Sep 2015 11:31:33 +0000 (17:01 +0530)
committerAnil Vishnoi <vishnoianil@gmail.com>
Fri, 11 Sep 2015 11:38:06 +0000 (17:08 +0530)
commit09354754ab1fdf042327667f467f88483f24ab38
treec756decc48d79891b1bd4220e0bbe930bc2595db
parent272a6c15978aabae127a112f18f27d537828e931
parent53770e68e6b68362ae957260d25d07023781f03a
Merge branch 'master' into topic/master/neutron-yang-migration

Conflicts:
openstack/net-virt/pom.xml
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
12 files changed:
integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
library/impl/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoderTest.java
library/impl/src/test/java/org/opendaylight/ovsdb/lib/notation/VersionTest.java
library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/hardwarevtep/HardwareVTEPIT.java
library/it/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java
openstack/net-virt-providers/pom.xml
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java
openstack/net-virt/pom.xml
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImpl.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityServicesImpl.java