Merge "Stop/disable l3 agent in docker service upgrade_tasks"
authorJenkins <jenkins@review.openstack.org>
Wed, 7 Jun 2017 15:11:07 +0000 (15:11 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 7 Jun 2017 15:11:07 +0000 (15:11 +0000)

Trivial merge