Merge "Drop overcloud-without-mergepy.yaml (again!)"
authorJenkins <jenkins@review.openstack.org>
Fri, 2 Sep 2016 23:11:40 +0000 (23:11 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 2 Sep 2016 23:11:40 +0000 (23:11 +0000)

Trivial merge