diff options
| author | Kevin L. Mitchell <kevin.mitchell@rackspace.com> | 2011-05-27 16:34:07 -0500 |
|---|---|---|
| committer | Kevin L. Mitchell <kevin.mitchell@rackspace.com> | 2011-05-27 16:34:07 -0500 |
| commit | fd52c3bad70aecdf8471d693f6ab4b57cca8d58c (patch) | |
| tree | 67c0e66bc5e98d33276950387723290ce4024aab /test/kill.sql | |
| parent | 5f03a982bf8b823084f4aa8775ee052576acff31 (diff) | |
| parent | 316fa7445c4cab35a164cf5bf7cb3330ae872c2a (diff) | |
Merge branch 'master' of git://github.com/rackspace/keystone
Conflicts:
bin/sampledata.sh
docs/guide/src/docbkx/identitydevguide.xml
keystone/db/sqlalchemy/api.py
keystone/db/sqlalchemy/models.py
keystone/logic/service.py
keystone/server.py
test/unit/test_common.py
test/unit/test_roles.py
Diffstat (limited to 'test/kill.sql')
0 files changed, 0 insertions, 0 deletions