Merge "Add docker templates for octavia services"
authorJenkins <jenkins@review.openstack.org>
Tue, 27 Jun 2017 23:20:55 +0000 (23:20 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 27 Jun 2017 23:20:55 +0000 (23:20 +0000)

Trivial merge