Merge "DVR: Rename dvr_update_router_addvm function"

author Jenkins <jenkins@review.openstack.org>

Fri, 8 Jan 2016 08:06:03 +0000 (08:06 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 8 Jan 2016 08:06:04 +0000 (08:06 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 8 Jan 2016 08:06:03 +0000 (08:06 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 8 Jan 2016 08:06:04 +0000 (08:06 +0000)
diff --cc neutron/tests/unit/scheduler/test_l3_agent_scheduler.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 8 Jan 2016 08:06:03 +0000 (08:06 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 8 Jan 2016 08:06:04 +0000 (08:06 +0000)