summaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge/merge.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-11 02:07:22 +0000
committerGerrit Code Review <review@openstack.org>2015-11-11 02:07:22 +0000
commitac680bff5f8ece671686b7ebffa22eaf17b43474 (patch)
tree764282568f35ace4172d68162a94da1855ba3150 /tripleo_heat_merge/merge.py
parentb044733893f97eae6ca8f081ee58c28bc9fa1f5a (diff)
parent1029b994d1b5e0c641da97886f75d982eb2c10f0 (diff)
Merge "Align some defaults with with ControllerCount default"
Diffstat (limited to 'tripleo_heat_merge/merge.py')
0 files changed, 0 insertions, 0 deletions