Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 36b3d9e 2f50006)
Merge "Allow setting the cinder iscsi-helper option"
authorJenkins <jenkins@review.openstack.org>
Tue, 8 Apr 2014 00:09:14 +0000 (00:09 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 8 Apr 2014 00:09:14 +0000 (00:09 +0000)
1  2 
block-storage.yaml patch | diff1 | diff2 | blob | history
overcloud-source.yaml patch | diff1 | diff2 | blob | history

diff --cc block-storage.yaml
Simple merge
diff --cc overcloud-source.yaml
Simple merge