diff options
| author | Sai Krishna <saikrishna1511@gmail.com> | 2011-04-29 16:24:19 +0530 |
|---|---|---|
| committer | Sai Krishna <saikrishna1511@gmail.com> | 2011-04-29 16:24:19 +0530 |
| commit | ec8cae010633b1c5df016d317432ad7db7c46b60 (patch) | |
| tree | 37b3062322800e680aa4fa9e7109f16055eff5e8 | |
| parent | 8b9e08b7d424bd4222b9868f5520b8c9d28e378d (diff) | |
| parent | 0d3a4c383a1da8ba0ee94397d8ac03f96e546082 (diff) | |
Merge branch 'master' of https://git.hcleai.com/keystone
Conflicts:
keystone/queryext/__init__.py
test/unit/test_identity.py
| -rw-r--r-- | foo2 | 0 | ||||
| -rw-r--r-- | sai | 0 |
2 files changed, 0 insertions, 0 deletions