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:
12c2fe3
72a025f
)
Merge "Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker"
author
Jenkins
<jenkins@review.openstack.org>
Fri, 15 May 2015 09:07:21 +0000
(09:07 +0000)
committer
Gerrit Code Review
<review@openstack.org>
Fri, 15 May 2015 09:07:21 +0000
(09:07 +0000)
1
2
puppet/manifests/overcloud_controller_pacemaker.pp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
puppet/manifests/overcloud_controller_pacemaker.pp
Simple merge