Merge "Fix typo in keystone"
This commit is contained in:
commit
56debcb586
|
@ -67,7 +67,7 @@ class TemplatedCatalog(kvs.Catalog):
|
|||
|
||||
and is stored in a similar looking hierarchy. Where a value can contain
|
||||
values to be interpolated by standard python string interpolation that look
|
||||
like (the % is replaced by a $ due to paste attmepting to interpolate on
|
||||
like (the % is replaced by a $ due to paste attempting to interpolate on
|
||||
its own:
|
||||
|
||||
http://localhost:$(public_port)s/
|
||||
|
|
|
@ -81,7 +81,7 @@ def is_ans1_token(token):
|
|||
|
||||
re: http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
|
||||
|
||||
pg4: For tags from 0 to 30 the first octet is the identfier
|
||||
pg4: For tags from 0 to 30 the first octet is the identifier
|
||||
pg10: Hex 30 means sequence, followed by the length of that sequence.
|
||||
pg5: Second octet is the length octet
|
||||
first bit indicates short or long form, next 7 bits encode the number
|
||||
|
|
|
@ -30,7 +30,7 @@ def register_admin_extension(url_prefix, extension_data):
|
|||
urls generated by the extension.
|
||||
|
||||
extension_data is a dictionary. The expected fields are:
|
||||
'name': short, human readable name of the extnsion
|
||||
'name': short, human readable name of the extension
|
||||
'namespace': xml namespace
|
||||
'alias': identifier for the extension
|
||||
'updated': date the extension was last updated
|
||||
|
|
|
@ -29,8 +29,8 @@ class EndpointFilterV3Controller(controller.V3Controller):
|
|||
"""Establishes an association between an endpoint and a project."""
|
||||
# NOTE(gyee): we just need to make sure endpoint and project exist
|
||||
# first. We don't really care whether if project is disabled.
|
||||
# The relationship can still be establed even with a disabled project
|
||||
# as there are no security implications.
|
||||
# The relationship can still be established even with a disabled
|
||||
# project as there are no security implications.
|
||||
self.catalog_api.get_endpoint(endpoint_id)
|
||||
self.assignment_api.get_project(project_id)
|
||||
# NOTE(gyee): we may need to cleanup any existing project-endpoint
|
||||
|
|
|
@ -63,7 +63,7 @@ def filter_user(user_ref):
|
|||
|
||||
|
||||
class DomainConfigs(dict):
|
||||
"""Discover, store and provide access to domain specifc configs.
|
||||
"""Discover, store and provide access to domain specific configs.
|
||||
|
||||
The setup_domain_drives() call will be made via the wrapper from
|
||||
the first call to any driver function handled by this manager. This
|
||||
|
@ -194,7 +194,7 @@ class Manager(manager.Manager):
|
|||
from with the @domains_configured wrapper in a lazy loading fashion
|
||||
to get around the fact that we can't satisfy the assignment api it needs
|
||||
from within our __init__() function since the assignment driver is not
|
||||
itself yet intitalized.
|
||||
itself yet initialized.
|
||||
|
||||
Each of the identity calls are pre-processed here to choose, based on
|
||||
domain, which of the drivers should be called. The non-domain-specific
|
||||
|
|
|
@ -47,7 +47,7 @@ class ModelBase(object):
|
|||
# raises NoneType exception if there is no running
|
||||
# transaction and rollback is called. As long as
|
||||
# sqlalchemy has this bug we have to create transaction
|
||||
# explicity.
|
||||
# explicitly.
|
||||
with session.begin(subtransactions=True):
|
||||
session.add(self)
|
||||
session.flush()
|
||||
|
|
|
@ -217,9 +217,9 @@ def drop_unique_constraint(migrate_engine, table_name, uc_name, *columns,
|
|||
NullType with the correct column type.
|
||||
|
||||
:param migrate_engine: sqlalchemy engine
|
||||
:param table_name: name of table that contains uniq constraint.
|
||||
:param uc_name: name of uniq constraint that will be dropped.
|
||||
:param columns: columns that are in uniq constraint.
|
||||
:param table_name: name of table that contains unique constraint.
|
||||
:param uc_name: name of unique constraint that will be dropped.
|
||||
:param columns: columns that are in unique constraint.
|
||||
:param col_name_col_instance: contains pair column_name=column_instance.
|
||||
column_instance is instance of Column. These params
|
||||
are required only for columns that have unsupported
|
||||
|
|
|
@ -52,7 +52,7 @@ def default_expire_time():
|
|||
def validate_auth_info(self, user_ref, tenant_ref):
|
||||
"""Validate user and tenant auth info.
|
||||
|
||||
Validate the user and tenant auth into in order to ensure that user and
|
||||
Validate the user and tenant auth info in order to ensure that user and
|
||||
tenant information is valid and not disabled.
|
||||
|
||||
Consolidate the checks here to ensure consistency between token auth and
|
||||
|
|
Loading…
Reference in New Issue