aboutsummaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge/merge.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-02-24 21:17:23 +0000
committerGerrit Code Review <review@openstack.org>2015-02-24 21:17:23 +0000
commit44c8ef87a6cf05d998859453b1545ac62a7568e0 (patch)
treee0738a9927d2e4920db6e87fd851e11e179db13d /tripleo_heat_merge/merge.py
parent99b0323a3436c08d74ae04a5a07ca020e246d10e (diff)
parent66aaf72d35fc7c9be5d4fc7605f8ad6d7b5c520e (diff)
Merge "ObjectStore: Exec puppet after all configuration"
Diffstat (limited to 'tripleo_heat_merge/merge.py')
0 files changed, 0 insertions, 0 deletions