Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: e0276ea 0e18ac5)
Merge "Manage password_validator regex"
authorJenkins <jenkins@review.openstack.org>
Wed, 25 Jan 2017 23:50:48 +0000 (23:50 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 25 Jan 2017 23:50:48 +0000 (23:50 +0000)
1  2 
capabilities-map.yaml patch | diff1 | diff2 | blob | history
puppet/services/horizon.yaml patch | diff1 | diff2 | blob | history

diff --cc capabilities-map.yaml
Simple merge
diff --cc puppet/services/horizon.yaml
Simple merge