Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: fd9d835 cd9264d)
Merge "honor the rabbit user and password provided"
authorJenkins <jenkins@review.openstack.org>
Fri, 13 Nov 2015 21:43:51 +0000 (21:43 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 13 Nov 2015 21:43:51 +0000 (21:43 +0000)
1  2 
puppet/compute.yaml patch | diff1 | diff2 | blob | history
puppet/controller.yaml patch | diff1 | diff2 | blob | history

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