Code Review
/
apex-tripleo-heat-templates.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
combined
(merge:
33db97c
8def87e
)
Merge "Add Redis as a Pacemaker resource"
author
Jenkins
<jenkins@review.openstack.org>
Tue, 9 Jun 2015 07:15:33 +0000
(07:15 +0000)
committer
Gerrit Code Review
<review@openstack.org>
Tue, 9 Jun 2015 07:15:33 +0000
(07:15 +0000)
1
2
controller.yaml
patch
|
diff1
|
diff2
|
blob
|
history
overcloud-without-mergepy.yaml
patch
|
diff1
|
diff2
|
blob
|
history
puppet/controller-puppet.yaml
patch
|
diff1
|
diff2
|
blob
|
history
puppet/manifests/overcloud_controller_pacemaker.pp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
controller.yaml
Simple merge
diff --cc
overcloud-without-mergepy.yaml
Simple merge
diff --cc
puppet/controller-puppet.yaml
Simple merge
diff --cc
puppet/manifests/overcloud_controller_pacemaker.pp
Simple merge