summaryrefslogtreecommitdiffstats
path: root/keystone-moon/keystone/controllers.py
diff options
context:
space:
mode:
authorasteroide <thomas.duval@orange.com>2015-09-01 16:03:26 +0200
committerasteroide <thomas.duval@orange.com>2015-09-01 16:04:53 +0200
commit92fd2dbfb672d7b2b1cdfd5dd5cf89f7716b3e12 (patch)
tree7ba22297042019e7363fa1d4ad26d1c32c5908c6 /keystone-moon/keystone/controllers.py
parent26e753254f3e43399cc76e62892908b7742415e8 (diff)
Update Keystone code from official Github repository with branch Master on 09/01/2015.
Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498
Diffstat (limited to 'keystone-moon/keystone/controllers.py')
-rw-r--r--keystone-moon/keystone/controllers.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/keystone-moon/keystone/controllers.py b/keystone-moon/keystone/controllers.py
index 12f13c77..085c1fb0 100644
--- a/keystone-moon/keystone/controllers.py
+++ b/keystone-moon/keystone/controllers.py
@@ -63,7 +63,7 @@ class Extensions(wsgi.Application):
return None
def get_extensions_info(self, context):
- return {'extensions': {'values': self.extensions.values()}}
+ return {'extensions': {'values': list(self.extensions.values())}}
def get_extension_info(self, context, extension_alias):
try:
@@ -146,9 +146,9 @@ class Version(wsgi.Application):
if 'v3' in _VERSIONS:
versions['v3'] = {
- 'id': 'v3.0',
+ 'id': 'v3.4',
'status': 'stable',
- 'updated': '2013-03-06T00:00:00Z',
+ 'updated': '2015-03-30T00:00:00Z',
'links': [
{
'rel': 'self',
@@ -177,7 +177,7 @@ class Version(wsgi.Application):
versions = self._get_versions_list(context)
return wsgi.render_response(status=(300, 'Multiple Choices'), body={
'versions': {
- 'values': versions.values()
+ 'values': list(versions.values())
}
})