openstack
/
deb-glance
Code Issues Proposed changes

Merge "Text formatting changes"

This commit is contained in:
Jenkins 2013-08-20 06:17:50 +00:00 committed by Gerrit Code Review
parent 90f76373fb 485274433f
commit e8d8c162d3
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -17,5 +17,6 @@
<jeblair@hp.com> <james.blair@rackspace.com> <jeblair@hp.com> <james.blair@rackspace.com>
<chris@pistoncloud.com> <chris@slicehost.com> <chris@pistoncloud.com> <chris@slicehost.com>
<ken.pepple@gmail.com> <ken.pepple@rabbityard.com> <ken.pepple@gmail.com> <ken.pepple@rabbityard.com>
<gareth@unitedstack.com> <academicgareth@gmail.com>
Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com> Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>
<yufang521247@gmail.com> <zhangyufang@360.cn> <yufang521247@gmail.com> <zhangyufang@360.cn>

4
doc/source/glanceapi.rst
View File

@ -404,8 +404,8 @@ The list of metadata headers that Glance accepts are listed below.
* ``x-image-meta-store`` * ``x-image-meta-store``
This header is optional. Valid values are one of ``file``, ``s3``, or This header is optional. Valid values are one of ``file``, ``s3``, ``rbd``,
``swift`` ``swift``, ``cinder``, ``gridfs`` or ``sheepdog``
When present, Glance will attempt to store the disk image data in the When present, Glance will attempt to store the disk image data in the
backing store indicated by the value of the header. If the Glance node backing store indicated by the value of the header. If the Glance node

2
doc/source/man/glanceapi.rst
View File

@ -40,7 +40,7 @@ OPTIONS
**--default_store=STORE** **--default_store=STORE**
The default backend store that Glance should use when storing virtual The default backend store that Glance should use when storing virtual
machine images. The default value is `filesystem`. Choices are any of machine images. The default value is `filesystem`. Choices are any of
`filesystem`, `swift`, or `s3` `filesystem`, `swift`, `rbd`, `cinder`, `gridfs`, `sheepdog` or `s3`
**--filesystem_store_datadir=DIR** **--filesystem_store_datadir=DIR**
The directory that the `filesystem` backend store should use to write The directory that the `filesystem` backend store should use to write

2
glance/common/config.py
View File

@ -174,7 +174,7 @@ def _get_paste_config_path():
# to the last config file # to the last config file
path = CONF.config_file[-1].replace(conf_suffix, paste_suffix) path = CONF.config_file[-1].replace(conf_suffix, paste_suffix)
else: else:
path = CONF.prog + '-paste.ini' path = CONF.prog + paste_suffix
return CONF.find_file(os.path.basename(path)) return CONF.find_file(os.path.basename(path))