Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 6551bec ff20b53)
Merge "Added support for pass-through iSER configuration"
authorJenkins <jenkins@review.openstack.org>
Fri, 20 Jan 2017 03:37:36 +0000 (03:37 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 20 Jan 2017 03:37:36 +0000 (03:37 +0000)
1  2 
capabilities-map.yaml patch | diff1 | diff2 | blob | history
puppet/services/cinder-volume.yaml patch | diff1 | diff2 | blob | history

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