summaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge/merge.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-11 02:21:17 +0000
committerGerrit Code Review <review@openstack.org>2015-11-11 02:21:17 +0000
commit9d5431a14f1f3a440fbbc5afa9f53a8ed476b881 (patch)
tree130a900fc2a7f11874d53939b6185dd712d88840 /tripleo_heat_merge/merge.py
parentac680bff5f8ece671686b7ebffa22eaf17b43474 (diff)
parentf161c8435a4ff6e3d4ed3798351092d03d2cd4ac (diff)
Merge "Revert "Manage keystone initialization directly in t-h-t manifests""
Diffstat (limited to 'tripleo_heat_merge/merge.py')
0 files changed, 0 insertions, 0 deletions