Merge lp:~zulcss/cinder/2013.3.rc1 into lp:~ubuntu-server-dev/cinder/havana

[Chuck Short]

2013.2~rc1

[lp:~zulcss/cinder/2013.3.rc1]

145. By Chuck Short on 2013-10-04

Fix changelog

[James Page (james-page)]

+1'ed in IRC

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-03 00:22:17 +0000
+++ debian/changelog	2013-10-04 12:51:22 +0000
@@ -1,6 +1,6 @@
-cinder (1:2013.2~b3-0ubuntu2) UNRELEASED; urgency=low
+cinder (1:2013.2~rc1-0ubuntu1) saucy; urgency=low
 
-  * New upstream release.
+  * New upstream release candidate.
   * debian/patches/skip-sqlachemy-failures.patch: Dropped
   * debian/patches/fix-sqlalchemy-requirements.patch: Refreshed.
   * debian/patches/fix-babel-requirements.patch: Revert dependency requirement
@@ -16,7 +16,7 @@
     - Bumped versioned dependencies for python-eventlet, python-hp3parclient,
       python-keystoneclient, and python-novaclient
 
- -- Chuck Short <[e-mail]>  Tue, 10 Sep 2013 11:45:33 -0400
+ -- Chuck Short <[e-mail]>  Fri, 04 Oct 2013 08:40:26 -0400
 
 cinder (1:2013.2~b3-0ubuntu1) saucy; urgency=low
 

=== modified file 'debian/patches/fix-sqlalchemy-requirements.patch'
--- debian/patches/fix-sqlalchemy-requirements.patch	2013-09-24 13:25:43 +0000
+++ debian/patches/fix-sqlalchemy-requirements.patch	2013-10-04 12:51:22 +0000
@@ -1,43 +1,6 @@
-diff --git a/cinder/tests/db/test_finish_migration.py b/cinder/tests/db/test_finish_migration.py
-index 4fba2a9..0d701aa 100644
---- a/cinder/tests/db/test_finish_migration.py
-+++ b/cinder/tests/db/test_finish_migration.py
-@@ -41,8 +41,11 @@ class FinishVolumeMigrationTestCase(test.TestCase):
-         dest_volume = testutils.create_volume(ctxt, host='dest',
-                                               migration_status='target:fake',
-                                               status='available')
--        db.finish_volume_migration(ctxt, src_volume['id'],
--                                   dest_volume['id'])
-+        try:
-+            db.finish_volume_migration(ctxt, src_volume['id'],
-+                                       dest_volume['id'])
-+        except:
-+            self.skipTest('Test fails with sqlalchemy 0.9.8')
- 
-         src_volume = db.volume_get(ctxt, src_volume['id'])
-         expected_name = 'volume-%s' % dest_volume['id']
-diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py
-index 8ce5b73..dc02ee6 100644
---- a/cinder/tests/test_volume.py
-+++ b/cinder/tests/test_volume.py
-@@ -1728,8 +1728,11 @@ class VolumeTestCase(BaseVolumeTestCase):
-         volume = tests_utils.create_volume(self.context, size=0,
-                                            host=CONF.host)
-         host_obj = {'host': 'newhost', 'capabilities': {}}
--        self.volume.migrate_volume(self.context, volume['id'],
--                                   host_obj, True)
-+        try:
-+            self.volume.migrate_volume(self.context, volume['id'],
-+                                       host_obj, True)
-+        except:
-+            self.skipTest('Tests failing on sqlalchemy 0.9.8')
-         volume = db.volume_get(context.get_admin_context(), volume['id'])
-         self.assertEqual(volume['host'], 'newhost')
-         self.assertEqual(volume['migration_status'], None)
-diff --git a/requirements.txt b/requirements.txt
-index 01ec2e6..97d79d8 100644
---- a/requirements.txt
-+++ b/requirements.txt
+diff -Naurp cinder-2013.2.rc1.orig/requirements.txt cinder-2013.2.rc1/requirements.txt
+--- cinder-2013.2.rc1.orig/requirements.txt	2013-10-04 05:11:50.000000000 -0400
++++ cinder-2013.2.rc1/requirements.txt	2013-10-04 08:33:32.072164528 -0400
 @@ -20,7 +20,7 @@ python-novaclient>=2.15.0
  python-swiftclient>=1.5
  Routes>=1.12.3