aboutsummaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge/merge.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-28 17:40:43 +0000
committerGerrit Code Review <review@openstack.org>2015-09-28 17:40:43 +0000
commit9e918a4a517f62d4417909311041e3e54a726462 (patch)
treecc12aec5e1b2ded61798b09db0bf8951329a6ba5 /tripleo_heat_merge/merge.py
parent02c7a6f12ba5648d3637fce6a57eb9eb4396a683 (diff)
parent2b2f0c263cd24d3b6f22ac594ddba6ce5ab4f75b (diff)
Merge "Adding core_plugin, type_drivers and service_plugins parameters"
Diffstat (limited to 'tripleo_heat_merge/merge.py')
0 files changed, 0 insertions, 0 deletions