From c3e2efda6de2ae4b0885c86eb077535e981b449f Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 28 Jan 2013 17:10:17 +0800 Subject: [PATCH] Fixes differences with upstream branch --- .gitreview | 1 - cinder/tests/api/v1/test_snapshots.py | 11 ----------- cinder/version.py | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) 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(): -- 2.45.2