Merge "Decrease rpc timeout after agent receives SIGTERM"

author Jenkins <jenkins@review.openstack.org>

Thu, 5 Feb 2015 00:03:29 +0000 (00:03 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 5 Feb 2015 00:03:29 +0000 (00:03 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 5 Feb 2015 00:03:29 +0000 (00:03 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 5 Feb 2015 00:03:29 +0000 (00:03 +0000)
diff --cc neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
Simple merge
diff --cc neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 5 Feb 2015 00:03:29 +0000 (00:03 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 5 Feb 2015 00:03:29 +0000 (00:03 +0000)
		1	2
neutron/plugins/openvswitch/agent/ovs_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history