Merge "BigSwitch: Use eventlet.sleep in watchdog"

author Jenkins <jenkins@review.openstack.org>

Thu, 20 Mar 2014 15:47:37 +0000 (15:47 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 20 Mar 2014 15:47:37 +0000 (15:47 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 20 Mar 2014 15:47:37 +0000 (15:47 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 20 Mar 2014 15:47:37 +0000 (15:47 +0000)
diff --cc neutron/plugins/bigswitch/servermanager.py
Simple merge
diff --cc neutron/tests/unit/bigswitch/test_servermanager.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 20 Mar 2014 15:47:37 +0000 (15:47 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 20 Mar 2014 15:47:37 +0000 (15:47 +0000)
		1	2
neutron/plugins/bigswitch/servermanager.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/bigswitch/test_servermanager.py	patch \|	diff1 \|	diff2 \|	blob \| history