aboutsummaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge/merge.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-01-24 23:18:31 +0000
committerGerrit Code Review <review@openstack.org>2014-01-24 23:18:31 +0000
commit6cecaac6a3257d422568f25c3b832c347a98ff92 (patch)
treef0b0e2133b8c30a9357d49140edfc4af9be329b9 /tripleo_heat_merge/merge.py
parent8ad2409ddb7ffe3e2d0d7fa3a25bdda791cc6978 (diff)
parentc411d229428cd9b369fd3cf7380d17795d6cde24 (diff)
Merge "Use OS::Heat::UpdateWaitConditionHandle"
Diffstat (limited to 'tripleo_heat_merge/merge.py')
0 files changed, 0 insertions, 0 deletions