Merge "Moved rpc_compat.py code back into rpc.py"

author Jenkins <jenkins@review.openstack.org>

Wed, 25 Jun 2014 03:48:03 +0000 (03:48 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 25 Jun 2014 03:48:03 +0000 (03:48 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 25 Jun 2014 03:48:03 +0000 (03:48 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 25 Jun 2014 03:48:03 +0000 (03:48 +0000)
diff --cc neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 25 Jun 2014 03:48:03 +0000 (03:48 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 25 Jun 2014 03:48:03 +0000 (03:48 +0000)