Fixes differences with upstream branch

diff --git a/.gitreview b/.gitreview
index 33a041b9aa72ded224ab492207f50e83401bb42e..eecf939449df795079aefc1ab6962eda685208a4 100644 (file)
--- 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 293323650c1bb8fa398fb318e72ab81e64b70d42..4bfe3e61295edde54e45d06e3bed2a935705915e 100644 (file)
--- 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 b77646dc23be21e4adfe625099ec7a88069e7785..3f50863fccc8e8da0869b86ebb83f58325dcc1b5 100644 (file)
--- 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():