diff options
| author | Ramana Juvvadi <rjuvvadi@hcl.com> | 2011-05-11 00:53:14 -0500 |
|---|---|---|
| committer | Ramana Juvvadi <rjuvvadi@hcl.com> | 2011-05-11 00:53:14 -0500 |
| commit | 2f99d9238719c9376b069e7ef0f03127bb74bab6 (patch) | |
| tree | b1d43ee48eb255748d9a78adf0253e0fa529252d /docs/guide | |
| parent | 01a10feab730567e4181d803ac8f4c0858fe9830 (diff) | |
| parent | 91c82cfcefd8d0a7719dfbcca6c3e50ec438d074 (diff) | |
Too much of duplication and incomplete conflict resolution in test_identity.py
Merge branch 'master' of https://git.hcleai.com/keystone
Conflicts:
keystone/auth_server.py
test/unit/test_identity.py
Diffstat (limited to 'docs/guide')
0 files changed, 0 insertions, 0 deletions