Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 0eb7001 ba1fb56)
Merge "Move gnocchi's kestone::auth parameters to API profile"
authorJenkins <jenkins@review.openstack.org>
Fri, 12 Aug 2016 15:48:26 +0000 (15:48 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 12 Aug 2016 15:48:26 +0000 (15:48 +0000)
1  2 
puppet/controller.yaml patch | diff1 | diff2 | blob | history
puppet/services/gnocchi-base.yaml patch | diff1 | diff2 | blob | history

diff --cc puppet/controller.yaml
Simple merge
diff --cc puppet/services/gnocchi-base.yaml
Simple merge