Merge "test_ovs_neutron_agent: Fix test_cleanup_stale_flows_iter_0"

author Jenkins <jenkins@review.openstack.org>

Tue, 25 Aug 2015 15:25:40 +0000 (15:25 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 25 Aug 2015 15:25:40 +0000 (15:25 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 25 Aug 2015 15:25:40 +0000 (15:25 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 25 Aug 2015 15:25:40 +0000 (15:25 +0000)
diff --cc neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 25 Aug 2015 15:25:40 +0000 (15:25 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 25 Aug 2015 15:25:40 +0000 (15:25 +0000)