diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-04-09 14:02:37 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-04-09 14:02:37 +0000 |
commit | 776a04838017624420e304371235c5298fb7e1d2 (patch) | |
tree | d77ae81e7efe05d7fc9ea5edf1d9ed0cae03657c | |
parent | 1889299cec755c54878d068df6b49a6038979929 (diff) | |
parent | 5ea4fcf3e5e75cc0dfd2bb99803734a67ece87fa (diff) | |
download | keystone-776a04838017624420e304371235c5298fb7e1d2.tar.gz |
Merge "mark 2.0 API as stable" into stable/folsom2012.2.4
-rw-r--r-- | keystone/service.py | 4 | ||||
-rw-r--r-- | tests/test_versions.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/keystone/service.py b/keystone/service.py index 9799e3a75..21529e4fe 100644 --- a/keystone/service.py +++ b/keystone/service.py @@ -190,8 +190,8 @@ class VersionController(wsgi.Application): versions = {} versions['v2.0'] = { 'id': 'v2.0', - 'status': 'beta', - 'updated': '2011-11-19T00:00:00Z', + 'status': 'stable', + 'updated': '2012-10-13T17:42:56Z', 'links': [ { 'rel': 'self', diff --git a/tests/test_versions.py b/tests/test_versions.py index 48554bf65..2ec3b1497 100644 --- a/tests/test_versions.py +++ b/tests/test_versions.py @@ -43,8 +43,8 @@ class VersionTestCase(test.TestCase): "values": [ { "id": "v2.0", - "status": "beta", - "updated": "2011-11-19T00:00:00Z", + "status": "stable", + "updated": "2012-10-13T17:42:56Z", "links": [ { "rel": "self", @@ -91,8 +91,8 @@ class VersionTestCase(test.TestCase): "values": [ { "id": "v2.0", - "status": "beta", - "updated": "2011-11-19T00:00:00Z", + "status": "stable", + "updated": "2012-10-13T17:42:56Z", "links": [ { "rel": "self", |