Merge "Clarify Kolla build overrides for tripleo"
authorJenkins <jenkins@review.openstack.org>
Fri, 24 Mar 2017 23:04:25 +0000 (23:04 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 24 Mar 2017 23:04:25 +0000 (23:04 +0000)

Trivial merge