Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: e473b46 326a2c1)
Merge "puppet: use identity_uri and auth_uri"
authorJenkins <jenkins@review.openstack.org>
Thu, 19 Mar 2015 11:03:38 +0000 (11:03 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 19 Mar 2015 11:03:38 +0000 (11:03 +0000)
1  2 
puppet/controller-puppet.yaml patch | diff1 | diff2 | blob | history

diff --cc puppet/controller-puppet.yaml
Simple merge