aboutsummaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge/merge.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-19 15:55:08 +0000
committerGerrit Code Review <review@openstack.org>2015-05-19 15:55:08 +0000
commite4dfaf4ab8295fdcb844b70238aae21a109d5282 (patch)
treed519637bce0d3f8a04681c8b24f53d736c6a288c /tripleo_heat_merge/merge.py
parent51a9fc752080e88889be2a9fc33c3c7e2c4c1f1d (diff)
parentaf90796cda5072a25c5ea9c9aeda5dc6e16c3db8 (diff)
Merge "Remove unused enable_pacemaker setting from templates"
Diffstat (limited to 'tripleo_heat_merge/merge.py')
0 files changed, 0 insertions, 0 deletions