]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Code Review / openstack-build / cinder-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: f212620 883f0f7)
Merge "Adds CA cert file path option for glance connections"
authorJenkins <jenkins@review.openstack.org>
Sat, 13 Sep 2014 13:44:42 +0000 (13:44 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 13 Sep 2014 13:44:42 +0000 (13:44 +0000)
1  2 
cinder/common/config.py patch | diff1 | diff2 | blob | history
etc/cinder/cinder.conf.sample patch | diff1 | diff2 | blob | history

diff --cc cinder/common/config.py
Simple merge
diff --cc etc/cinder/cinder.conf.sample
Simple merge