From: Thomas Goirand <thomas@goirand.fr>
Date: Mon, 28 Jan 2013 09:10:17 +0000 (+0800)
Subject: Fixes differences with upstream branch
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c3e2efda6de2ae4b0885c86eb077535e981b449f;p=openstack-build%2Fcinder-build.git

Fixes differences with upstream branch
---

diff --git a/.gitreview b/.gitreview
index 33a041b9a..eecf93944 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,3 @@
 host=review.openstack.org
 port=29418
 project=openstack/cinder.git
-defaultbranch=stable/folsom
diff --git a/cinder/tests/api/v1/test_snapshots.py b/cinder/tests/api/v1/test_snapshots.py
index 293323650..4bfe3e612 100644
--- a/cinder/tests/api/v1/test_snapshots.py
+++ b/cinder/tests/api/v1/test_snapshots.py
@@ -170,17 +170,6 @@ class SnapshotApiTest(test.TestCase):
         self.assertRaises(webob.exc.HTTPNotFound, self.controller.update, req,
                           'not-the-uuid', body)
 
-        snapshot = {"volume_id": "12",
-                "force": "**&&^^%%$$##@@",
-                "display_name": "Snapshot Test Name",
-                "display_description": "Snapshot Test Desc"}
-        body = dict(snapshot=snapshot)
-        req = fakes.HTTPRequest.blank('/v1/snapshots')
-        self.assertRaises(exception.InvalidParameterValue,
-                          self.controller.create,
-                          req,
-                          body)
-
     def test_snapshot_delete(self):
         self.stubs.Set(volume.api.API, "get_snapshot", stub_snapshot_get)
         self.stubs.Set(volume.api.API, "delete_snapshot", stub_snapshot_delete)
diff --git a/cinder/version.py b/cinder/version.py
index b77646dc2..3f50863fc 100644
--- a/cinder/version.py
+++ b/cinder/version.py
@@ -16,7 +16,7 @@
 
 CINDER_VERSION = ['2013', '1', None]
 YEAR, COUNT, REVISION = CINDER_VERSION
-FINAL = True   # This becomes true at Release Candidate time
+FINAL = False   # This becomes true at Release Candidate time
 
 
 def canonical_version_string():