Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 5854a63 b4cd2ed)
Merge "Use network-based fqdn entry from hiera instead of the custom fact"
authorJenkins <jenkins@review.openstack.org>
Fri, 2 Dec 2016 09:40:36 +0000 (09:40 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 2 Dec 2016 09:40:36 +0000 (09:40 +0000)
1  2 
puppet/services/database/mysql.yaml patch | diff1 | diff2 | blob | history
puppet/services/keystone.yaml patch | diff1 | diff2 | blob | history

diff --cc puppet/services/database/mysql.yaml
Simple merge
diff --cc puppet/services/keystone.yaml
Simple merge