summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-03-07 07:21:00 +0000
committerGerrit Code Review <review@openstack.org>2013-03-07 07:21:00 +0000
commit04969075b89e70b2dee1830cd93a6aba5a4e2c39 (patch)
treea36f23d20df76f75587f54050642cd19be831d8c
parent2e1d8128bcac5cb1c996823997f9ae0cdb0622bd (diff)
parent156f4746a69b406888119712de65d4da3e19cbeb (diff)
downloadkeystone-04969075b89e70b2dee1830cd93a6aba5a4e2c39.tar.gz
keystone-04969075b89e70b2dee1830cd93a6aba5a4e2c39.tar.xz
keystone-04969075b89e70b2dee1830cd93a6aba5a4e2c39.zip
Merge "mark 2.0 API as stable"
-rw-r--r--keystone/controllers.py4
-rw-r--r--tests/test_versions.py8
2 files changed, 6 insertions, 6 deletions
diff --git a/keystone/controllers.py b/keystone/controllers.py
index 3aaa8f59..e19840e9 100644
--- a/keystone/controllers.py
+++ b/keystone/controllers.py
@@ -91,8 +91,8 @@ class Version(wsgi.Application):
versions = {}
versions['v2.0'] = {
'id': 'v2.0',
- 'status': 'beta',
- 'updated': '2011-11-19T00:00:00Z',
+ 'status': 'stable',
+ 'updated': '2013-03-06T00:00:00Z',
'links': [
{
'rel': 'self',
diff --git a/tests/test_versions.py b/tests/test_versions.py
index 48554bf6..8faf68ca 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": '2013-03-06T00:00:00Z',
"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": '2013-03-06T00:00:00Z',
"links": [
{
"rel": "self",