Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 0dd1512 81863d1)
Merge "Re-enable Ceilometer composable roles for controller"
authorJenkins <jenkins@review.openstack.org>
Mon, 11 Jul 2016 20:23:24 +0000 (20:23 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 11 Jul 2016 20:23:24 +0000 (20:23 +0000)
1  2 
overcloud.yaml patch | diff1 | diff2 | blob | history
puppet/controller.yaml patch | diff1 | diff2 | blob | history

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