Merge "Cleanup in keepalived tests"

author Jenkins <jenkins@review.openstack.org>

Fri, 13 Feb 2015 05:19:55 +0000 (05:19 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 13 Feb 2015 05:19:55 +0000 (05:19 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 13 Feb 2015 05:19:55 +0000 (05:19 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 13 Feb 2015 05:19:55 +0000 (05:19 +0000)
diff --cc neutron/tests/functional/agent/test_l3_agent.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 13 Feb 2015 05:19:55 +0000 (05:19 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 13 Feb 2015 05:19:55 +0000 (05:19 +0000)