Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 4e0acc6 7c09ccf)
Merge "puppet: allow config of ad-hoc Heat settings"
authorJenkins <jenkins@review.openstack.org>
Fri, 22 Jan 2016 21:56:10 +0000 (21:56 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 22 Jan 2016 21:56:10 +0000 (21:56 +0000)

Trivial merge