diff options
| author | Dolph Mathews <dolph.mathews@gmail.com> | 2012-11-02 14:52:38 -0500 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@gmail.com> | 2012-11-02 14:53:44 -0500 |
| commit | 86aaff4a50039a927eac2ca0db927249058bef12 (patch) | |
| tree | ab803c7bc3c5b778910a80595eb0d58d74391bb3 /docs/source | |
| parent | a6ef09d94300718197a4fa8757fd3a7a45876963 (diff) | |
| parent | 399cb4cc71c5d48f58a668e0233396de97e65f89 (diff) | |
Merge remote-tracking branch 'origin/feature/keystone-v3' into HEAD
Conflicts:
keystone/catalog/core.py
keystone/identity/core.py
Change-Id: Id47b9dd9c4da811d13454b539f78b751d40ed87d
Diffstat (limited to 'docs/source')
0 files changed, 0 insertions, 0 deletions