Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: ccb13e7 6108501)
Merge "Put docker puppet config in puppet_config dict"
authorJenkins <jenkins@review.openstack.org>
Mon, 6 Mar 2017 10:32:52 +0000 (10:32 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 6 Mar 2017 10:32:52 +0000 (10:32 +0000)
1  2 
docker/services/keystone.yaml patch | diff1 | diff2 | blob | history

diff --cc docker/services/keystone.yaml
Simple merge