git.opendaylight Code Review - netvirt.git/commit

Merge remote-tracking branch 'origin/master' into merge-branch

Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Conflicts:
.gitignore
distribution/opendaylight/pom.xml
neutron/pom.xml
neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/SouthboundHandler.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/TenantNetworkManager.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10Provider.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13ProviderManager.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/ProviderNetworkManager.java
northbound/pom.xml
ovsdb/pom.xml
ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/OVSDBNettyFactoryIT.java
ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestDeletePortIT.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBase.java

Change-Id: Ib84968636e29a86a2308c112f251e7b5fd0ab0dc
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

author	Madhu Venugopal <mavenugo@gmail.com>
	Mon, 16 Jun 2014 23:07:37 +0000 (16:07 -0700)
committer	Madhu Venugopal <mavenugo@gmail.com>
	Tue, 17 Jun 2014 00:34:41 +0000 (17:34 -0700)
commit	f6cf705bbea44e417a52b32587ec47670e990fc9
tree	f63e1d87f535af2431fb4d522106b0b34dbc72a1	tree \| snapshot
parent	f953056d4180ec1e9672f7810cb4318f6d02ffd7	commit \| diff
parent	159507c0547064de1d4bb237474f5cbf135dc901	commit \| diff

commons/parent/pom.xml	diff1 \|	diff2 \|	blob \| history
distribution/opendaylight/pom.xml	diff1 \|	diff2 \|	blob \| history
neutron/pom.xml	diff1 \|	diff2 \|	blob \| history
neutron/src/main/java/org/opendaylight/ovsdb/neutron/AdminConfigManager.java	diff1 \|	diff2 \|	blob \| history
neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java	diff1 \|	diff2 \|	blob \| history
neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java	diff1 \|	diff2 \|	blob \| history
neutron/src/main/java/org/opendaylight/ovsdb/neutron/NodeConfiguration.java	diff1 \|	diff2 \|	blob \| history
neutron/src/main/java/org/opendaylight/ovsdb/neutron/PortHandler.java	diff1 \|	diff2 \|	blob \| history
neutron/src/main/java/org/opendaylight/ovsdb/neutron/SouthboundEvent.java	diff1 \|	diff2 \|	blob \| history
neutron/src/main/java/org/opendaylight/ovsdb/neutron/SouthboundHandler.java	diff1 \|	diff2 \|	blob \| history
neutron/src/main/java/org/opendaylight/ovsdb/neutron/TenantNetworkManager.java	diff1 \|	diff2 \|	blob \| history
neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10Provider.java	diff1 \|	diff2 \|	blob \| history
neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13Provider.java	\|	diff2 \|	blob \| history
neutron/src/test/java/org/opendaylight/ovsdb/neutron/AdminConfigManagerTest.java	diff1 \|	diff2 \|	blob \| history
northbound/src/main/java/org/opendaylight/ovsdb/northbound/OVSDBRow.java	diff1 \|	diff2 \|	blob \| history
plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java	diff1 \|	diff2 \|	blob \| history
plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConnectionService.java	diff1 \|	diff2 \|	blob \| history
plugin/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java	diff1 \|	diff2 \|	blob \| history
plugin/src/main/java/org/opendaylight/ovsdb/plugin/OVSDBInventoryListener.java	diff1 \|	diff2 \|	blob \| history
plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddBridgeIT.java	diff1 \|	diff2 \|	blob \| history
plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddPortIT.java	diff1 \|	diff2 \|	blob \| history
plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddTunnelIT.java	diff1 \|	diff2 \|	blob \| history
plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddVlanIT.java	diff1 \|	diff2 \|	blob \| history
plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBase.java	diff1 \|	diff2 \|	blob \| history
plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBridgeConfigIT.java	diff1 \|	diff2 \|	blob \| history
plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestDeletePortIT.java	diff1 \|	diff2 \|	blob \| history
plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestGetBridgeDomainsIT.java	diff1 \|	diff2 \|	blob \| history
plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetManagerIT.java	diff1 \|	diff2 \|	blob \| history
plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetOFControllerIT.java	diff1 \|	diff2 \|	blob \| history