diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2015-08-06 09:37:43 -0500 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2015-08-06 09:37:43 -0500 |
| commit | 4e498a54d0034b2ce5c87130f080ff580d241600 (patch) | |
| tree | d21d11091373e80bf1a4f70ecf1ee54ff82e0ff8 /keystoneclient/v3/users.py | |
| parent | d5c5423d6de3710e3480e47062333b33e8de0713 (diff) | |
| parent | eae8e83f5a7a170b98ef2d74a4ffd9eac7cc47ba (diff) | |
| download | python-keystoneclient-feature/keystoneauth_integration.tar.gz | |
Merge remote-tracking branch 'origin/master' into merge-branchfeature/keystoneauth_integration
Conflicts:
keystoneclient/exceptions.py
keystoneclient/fixture/discovery.py
keystoneclient/fixture/v2.py
keystoneclient/fixture/v3.py
keystoneclient/middleware/auth_token.py
keystoneclient/middleware/s3_token.py
keystoneclient/tests/unit/test_auth_token_middleware.py
keystoneclient/tests/unit/test_memcache_crypt.py
keystoneclient/tests/unit/test_s3_token_middleware.py
requirements.txt
test-requirements.txt
Change-Id: Ib51acebaac7966bf37c1562fa15b9061df6a7aa5
Diffstat (limited to 'keystoneclient/v3/users.py')
| -rw-r--r-- | keystoneclient/v3/users.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystoneclient/v3/users.py b/keystoneclient/v3/users.py index 2e20ede..35c42cc 100644 --- a/keystoneclient/v3/users.py +++ b/keystoneclient/v3/users.py @@ -156,7 +156,7 @@ class UserManager(base.CrudManager): params = {'user': {'password': new_password, 'original_password': old_password}} - base_url = '/users/%s/password' % self.api.user_id + base_url = '/users/%s/password' % self.client.user_id return self._update(base_url, params, method='POST', log=False, endpoint_filter={'interface': 'public'}) |