summaryrefslogtreecommitdiffstats
path: root/docs/nova-api-paste.ini
diff options
context:
space:
mode:
authorSai Krishna <saikrishna1511@gmail.com>2011-05-16 19:51:14 +0530
committerSai Krishna <saikrishna1511@gmail.com>2011-05-16 19:51:14 +0530
commit11d22448a9b3960a468a1a4ec82657495d39e6b7 (patch)
tree53ee85f6af35452cd6b22a4594aa77743ea9b3f4 /docs/nova-api-paste.ini
parentcdacf853221f18ee3cb4d75f35a63f9da979a8fa (diff)
parent04c2f955bbe82b5b8fe9a132c9fc9bdc8abc19a6 (diff)
Merge branch 'master' of https://git.hcleai.com/keystone
Conflicts: test/unit/test_groups.py
Diffstat (limited to 'docs/nova-api-paste.ini')
0 files changed, 0 insertions, 0 deletions