Merge "Fix for cache cleanup in protocol plugin on container deletion"

author Giovanni Meo <gmeo@cisco.com>

Fri, 13 Sep 2013 15:24:27 +0000 (15:24 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Fri, 13 Sep 2013 15:24:27 +0000 (15:24 +0000)
author Giovanni Meo <gmeo@cisco.com>
Fri, 13 Sep 2013 15:24:27 +0000 (15:24 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Fri, 13 Sep 2013 15:24:27 +0000 (15:24 +0000)
diff --cc opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java
Simple merge
diff --cc opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryServiceShim.java
Simple merge
author	Giovanni Meo <gmeo@cisco.com>
	Fri, 13 Sep 2013 15:24:27 +0000 (15:24 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Fri, 13 Sep 2013 15:24:27 +0000 (15:24 +0000)
		1	2
opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java	patch \|	diff1 \|	diff2 \|	blob \| history
opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryServiceShim.java	patch \|	diff1 \|	diff2 \|	blob \| history