diff options
| author | Adipudi Praveena <padipudi@padipudi.(none)> | 2011-05-11 16:59:44 +0530 |
|---|---|---|
| committer | Adipudi Praveena <padipudi@padipudi.(none)> | 2011-05-11 16:59:44 +0530 |
| commit | 1daef1f7f6bbf79fc7b65fd2265d69701fd5f105 (patch) | |
| tree | dcdccebae6c9f25b5ab527768f52bbe11a72a186 /test/kill.sql | |
| parent | fe3f343572b55b95ff456eb11dd3211ade8a285b (diff) | |
| parent | 0175ab7d74c83f9aa053a48777dca8180bec0f44 (diff) | |
| download | keystone-1daef1f7f6bbf79fc7b65fd2265d69701fd5f105.tar.gz keystone-1daef1f7f6bbf79fc7b65fd2265d69701fd5f105.tar.xz keystone-1daef1f7f6bbf79fc7b65fd2265d69701fd5f105.zip | |
Merge branch 'master' of https://git.hcleai.com/keystone
Resolved Conflicts with Sirish' and Abdul's Merge
Conflicts:
keystone/db/sqlalchemy/api.py
keystone/server.py
Diffstat (limited to 'test/kill.sql')
0 files changed, 0 insertions, 0 deletions