openstack/glance
Code Issues Proposed changes

Merge "Minor grammar corrections."

Browse Source
This commit is contained in:
Jenkins 2012-04-11 15:17:11 +00:00 committed by Gerrit Code Review
commit fc816ee029
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Authors
View File

@ -45,6 +45,7 @@ Mike Lundy <mike@pistoncloud.com>
Monty Taylor <mordred@inaugust.com>
Pádraig Brady <P@draigBrady.com>
Paul Bourke <paul-david.bourke@hp.com>
Paul McMillan <paul.mcmillan@nebula.com>
Pavan Kumar Sunkara <pavan.sss1991@gmail.com>
Peng Yong <ppyy@pubyun.com>
Pete Zaitcev <zaitcev@kotori.zaitcev.us>

2
doc/source/conf.py
View File

@ -18,7 +18,7 @@
# Glance documentation build configuration file, created by
# sphinx-quickstart on Tue May 18 13:50:15 2010.
#
# This file is execfile()'d with the current directory set to it's containing
# This file is execfile()'d with the current directory set to its containing
# dir.
#
# Note that not all possible configuration values are present in this

2
doc/source/configuring.rst
View File

@ -403,7 +403,7 @@ Can only be specified in configuration files.
Sets the name of the bucket to use for Glance images in S3.
Note that the namespace for S3 buckets is **global**, and
Note that the namespace for S3 buckets is **global**,
therefore you must use a name for the bucket that is unique. It
is recommended that you use a combination of your AWS access key,
**lowercased** with "glance".

2
glance/common/wsgi.py
View File

@ -533,7 +533,7 @@ class BasePasteFactory(object):
"""Import an app/filter class.
Lookup the KEY from the PasteDeploy local conf and import the
class named there. This class can then be used as an app or
class named therein. This class can then be used as an app or
filter factory.
Note we support the <module>:<class> format.

2
glance/registry/db/api.py
View File

@ -296,7 +296,7 @@ def paginate_query(query, model, limit, sort_keys, marker=None,
if 'id' not in sort_keys:
# TODO(justinsb): If this ever gives a false-positive, check
# the actual primary key, rather than assuming it's id
# the actual primary key, rather than assuming its id
logger.warn(_('Id not in sort_keys; is sort_keys unique?'))
assert(not (sort_dir and sort_dirs))