Merge "move attributes of v3.client.Client into alphabetical order"

This commit is contained in:
Jenkins
2014-08-08 15:47:04 +00:00
committed by Gerrit Code Review

View File

@@ -141,10 +141,6 @@ EndpointFilterManager`
:py:class:`keystoneclient.v3.services.ServiceManager` :py:class:`keystoneclient.v3.services.ServiceManager`
.. py:attribute:: users
:py:class:`keystoneclient.v3.users.UserManager`
.. py:attribute:: tokens .. py:attribute:: tokens
:py:class:`keystoneclient.v3.tokens.TokenManager` :py:class:`keystoneclient.v3.tokens.TokenManager`
@@ -153,6 +149,10 @@ EndpointFilterManager`
:py:class:`keystoneclient.v3.contrib.trusts.TrustManager` :py:class:`keystoneclient.v3.contrib.trusts.TrustManager`
.. py:attribute:: users
:py:class:`keystoneclient.v3.users.UserManager`
""" """
version = 'v3' version = 'v3'
@@ -174,9 +174,9 @@ EndpointFilterManager`
self.role_assignments = role_assignments.RoleAssignmentManager(self) self.role_assignments = role_assignments.RoleAssignmentManager(self)
self.roles = roles.RoleManager(self) self.roles = roles.RoleManager(self)
self.services = services.ServiceManager(self) self.services = services.ServiceManager(self)
self.users = users.UserManager(self)
self.tokens = tokens.TokenManager(self) self.tokens = tokens.TokenManager(self)
self.trusts = trusts.TrustManager(self) self.trusts = trusts.TrustManager(self)
self.users = users.UserManager(self)
# DEPRECATED: if session is passed then we go to the new behaviour of # DEPRECATED: if session is passed then we go to the new behaviour of
# authenticating on the first required call. # authenticating on the first required call.