diff options
| author | Sai Krishna <saikrishna1511@gmail.com> | 2011-05-16 10:22:35 +0530 |
|---|---|---|
| committer | Sai Krishna <saikrishna1511@gmail.com> | 2011-05-16 10:22:35 +0530 |
| commit | 61d7addeaf56867a4d1b124bd289e340e9a2e5c9 (patch) | |
| tree | 459ade442ecb420ab89be7fa949f007d60c4ec79 /docs/nova-api-paste.ini | |
| parent | 46cb1d53d0ee46ea6d68a8430843dbe468624e91 (diff) | |
| parent | 565223a519c5f9a24973cacd7a1728e1130dbf73 (diff) | |
Merge branch 'github/master'
Conflicts:
keystone/logic/service.py
Diffstat (limited to 'docs/nova-api-paste.ini')
0 files changed, 0 insertions, 0 deletions