Merge "Remove root_helper arg for ovs_lib"

author Jenkins <jenkins@review.openstack.org>

Wed, 18 Feb 2015 05:38:08 +0000 (05:38 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 18 Feb 2015 05:38:08 +0000 (05:38 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 18 Feb 2015 05:38:08 +0000 (05:38 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 18 Feb 2015 05:38:08 +0000 (05:38 +0000)
diff --cc neutron/tests/unit/openvswitch/test_ovs_tunnel.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 18 Feb 2015 05:38:08 +0000 (05:38 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 18 Feb 2015 05:38:08 +0000 (05:38 +0000)