diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-06 17:48:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-06 17:48:40 +0000 |
| commit | c90412eb4a6f940c67f34743e91ab4bead22da17 (patch) | |
| tree | 78db66c725f7b042a3c9bc55b018d853298e841a /keystoneclient | |
| parent | ac5df4aa1ffc2aaeb2f35472fa2b3b969f4e07a6 (diff) | |
| parent | bc85765e474bb40534dadb4eba76689650a468b7 (diff) | |
| download | python-keystoneclient-c90412eb4a6f940c67f34743e91ab4bead22da17.tar.gz | |
Merge "Wrong usage of "a/an""
Diffstat (limited to 'keystoneclient')
| -rw-r--r-- | keystoneclient/contrib/auth/v3/saml2.py | 2 | ||||
| -rw-r--r-- | keystoneclient/v3/regions.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keystoneclient/contrib/auth/v3/saml2.py b/keystoneclient/contrib/auth/v3/saml2.py index 2e74996..541e0d5 100644 --- a/keystoneclient/contrib/auth/v3/saml2.py +++ b/keystoneclient/contrib/auth/v3/saml2.py @@ -851,7 +851,7 @@ class ADFSUnscopedToken(_BaseSAMLPlugin): This is a multistep process:: * Prepare ADFS Request Securty Token - - build a etree.XML object filling certain attributes with proper user + build an etree.XML object filling certain attributes with proper user credentials, created/expires dates (ticket is be valid for 120 seconds as currently we don't handle reusing ADFS issued security tokens) . Step handled by ``ADFSUnscopedToken._prepare_adfs_request()`` method. diff --git a/keystoneclient/v3/regions.py b/keystoneclient/v3/regions.py index 0cbec20..10a9b23 100644 --- a/keystoneclient/v3/regions.py +++ b/keystoneclient/v3/regions.py @@ -19,7 +19,7 @@ class Region(base.Resource): Attributes: * id: a string that identifies the region. * description: a string that describes the region. Optional. - * parent_region_id: string that is the id field for an pre-existing + * parent_region_id: string that is the id field for a pre-existing region in the backend. Allows for hierarchical region organization * enabled: determines whether the endpoint appears in the catalog. |