diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-03 16:59:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-03 16:59:26 +0000 |
| commit | 7ea9dabaa45fbf7980461b218a4af7615a6913e2 (patch) | |
| tree | e442c4b2c3edab97cf204c31e259b001e5d9dd02 | |
| parent | 4202f7029b8ed8c5f7676b1934a31754184ddd7f (diff) | |
| parent | d3058a1c41bfd45be4a298679392a448662ecc00 (diff) | |
| download | keystone-7ea9dabaa45fbf7980461b218a4af7615a6913e2.tar.gz keystone-7ea9dabaa45fbf7980461b218a4af7615a6913e2.tar.xz keystone-7ea9dabaa45fbf7980461b218a4af7615a6913e2.zip | |
Merge "Do not crash when trying to remove a user role (without a tenant)"
| -rw-r--r-- | keystone/contrib/admin_crud/core.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystone/contrib/admin_crud/core.py b/keystone/contrib/admin_crud/core.py index 98ddd791..d3c1d168 100644 --- a/keystone/contrib/admin_crud/core.py +++ b/keystone/contrib/admin_crud/core.py @@ -123,7 +123,7 @@ class CrudExtension(wsgi.ExtensionRouter): mapper.connect( '/users/{user_id}/roles/OS-KSADM/{role_id}', controller=role_controller, - action='delete_role_from_user', + action='remove_role_from_user', conditions=dict(method=['DELETE'])) # COMPAT(diablo): User Roles |