]> 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: c4702d8 e5a4c75)
Merge "Added glance_request_timeout config option."
authorJenkins <jenkins@review.openstack.org>
Wed, 14 Aug 2013 06:32:42 +0000 (06:32 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 14 Aug 2013 06:32:42 +0000 (06:32 +0000)
1  2 
cinder/image/glance.py patch | diff1 | diff2 | blob | history
etc/cinder/cinder.conf.sample patch | diff1 | diff2 | blob | history

diff --cc cinder/image/glance.py
Simple merge
diff --cc etc/cinder/cinder.conf.sample
Simple merge