diff options
| author | sirish.bitra <sirish.bitra@gmail.com> | 2011-05-12 19:07:45 +0530 |
|---|---|---|
| committer | sirish.bitra <sirish.bitra@gmail.com> | 2011-05-12 19:07:45 +0530 |
| commit | bbed8921549de9951099ea7c5053692a7951ae97 (patch) | |
| tree | f1789068ebc22b09411dcd64a03316f3143651b3 /docs/nova-api-paste.ini | |
| parent | 6457b72ed03970c0fbd3b8000fa4619d8964edcd (diff) | |
| parent | 42e8bf272ab15998191617bc902d1a10627f7d65 (diff) | |
Merge branch 'master' of https://git.hcleai.com/keystone
Conflicts:
test/unit/test_authentication.py
test/unit/test_groups.py
test/unit/test_tenant_groups.py
test/unit/test_tenants.py
test/unit/test_token.py
test/unit/test_users.py
test/unit/test_version.py
Diffstat (limited to 'docs/nova-api-paste.ini')
0 files changed, 0 insertions, 0 deletions