summaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge/merge.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-07-17 18:19:57 +0000
committerGerrit Code Review <review@openstack.org>2014-07-17 18:19:57 +0000
commitaf8502609c26bf6b69aaf47117dc40c0cfe52112 (patch)
tree5e9abbf275f9aeb9f1a1415493b9014ec65acb73 /tripleo_heat_merge/merge.py
parent1a598838ee72c752a4352d85734193196537e569 (diff)
parent687b100b4c8731c97fb542db42709f2de05a5881 (diff)
Merge "make glance.host point to controller_virtual_ip"
Diffstat (limited to 'tripleo_heat_merge/merge.py')
0 files changed, 0 insertions, 0 deletions