Merge "Drop RpcProxy usage from cisco.cfg_agent"

author Jenkins <jenkins@review.openstack.org>

Wed, 26 Nov 2014 00:33:22 +0000 (00:33 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 26 Nov 2014 00:33:22 +0000 (00:33 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 26 Nov 2014 00:33:22 +0000 (00:33 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 26 Nov 2014 00:33:22 +0000 (00:33 +0000)
diff --cc neutron/plugins/cisco/cfg_agent/cfg_agent.py
Simple merge
diff --cc neutron/plugins/cisco/cfg_agent/service_helpers/routing_svc_helper.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 26 Nov 2014 00:33:22 +0000 (00:33 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 26 Nov 2014 00:33:22 +0000 (00:33 +0000)
		1	2
neutron/plugins/cisco/cfg_agent/cfg_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/cisco/cfg_agent/service_helpers/routing_svc_helper.py	patch \|	diff1 \|	diff2 \|	blob \| history