aboutsummaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge/merge.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-10-30 16:38:34 +0000
committerGerrit Code Review <review@openstack.org>2014-10-30 16:38:34 +0000
commita9d03c8ba7f6b423f1280da604e00d2e96236c67 (patch)
tree6b5a26fce01ac6d70da99c98a200075555a6008d /tripleo_heat_merge/merge.py
parentb6fac3c901189a081e80cc1fb43f09e3d6a2f8f7 (diff)
parent9cf073075c4331ebd323768a11deda30e975d22d (diff)
Merge "Don't replace OS::Neutron::Port on update"
Diffstat (limited to 'tripleo_heat_merge/merge.py')
0 files changed, 0 insertions, 0 deletions