Code Review / apex-puppet-tripleo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 92f9c95 a6089cb)
Merge "Add panko service support"
authorJenkins <jenkins@review.openstack.org>
Mon, 21 Nov 2016 21:19:37 +0000 (21:19 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 21 Nov 2016 21:19:37 +0000 (21:19 +0000)
1  2 
manifests/haproxy.pp patch | diff1 | diff2 | blob | history
manifests/profile/base/keystone.pp patch | diff1 | diff2 | blob | history

diff --cc manifests/haproxy.pp
Simple merge
diff --cc manifests/profile/base/keystone.pp
Simple merge