diff options
| author | John Eo <joon.eo@gmail.com> | 2011-04-28 13:50:57 -0500 |
|---|---|---|
| committer | John Eo <joon.eo@gmail.com> | 2011-04-28 13:50:57 -0500 |
| commit | e6482b36eb24e9713dc5de28d051c19bbe4bd615 (patch) | |
| tree | a0a48bda97e2cd21105bdff1ba69d48124f83a50 /docs/nova-api-paste.ini | |
| parent | 62e32e1b3399f308e44a4357819faa8575cd5908 (diff) | |
| parent | b42d40a726868be543e877706958a0921d4dcd93 (diff) | |
Merge branch 'master' of https://github.com/khussein/keystone
Conflicts:
test/unit/test_identity.py
Diffstat (limited to 'docs/nova-api-paste.ini')
0 files changed, 0 insertions, 0 deletions