Merge lp:~corey.bryant/cinder/2014.1.1 into lp:~ubuntu-server-dev/cinder/icehouse

Proposed by Corey Bryant on 2014-06-09
Status: Merged
Approved by: Chuck Short on 2014-06-09
Approved revision: 181
Merged at revision: 181
Proposed branch: lp:~corey.bryant/cinder/2014.1.1
Merge into: lp:~ubuntu-server-dev/cinder/icehouse
Diff against target: 55 lines (+30/-7)
2 files modified
debian/changelog (+22/-0)
debian/patches/fix-requirements.patch (+8/-7)
To merge this branch: bzr merge lp:~corey.bryant/cinder/2014.1.1
Reviewer Review Type Date Requested Status
Chuck Short (community) 2014-06-09 Needs Fixing on 2014-06-09
Review via email: mp+222525@code.launchpad.net

Description of the change

Ubuntu Stable Release Update for OpenStack Icehouse

To post a comment you must log in.
Chuck Short (zulcss) wrote :

See inline comments.

review: Needs Fixing
lp:~corey.bryant/cinder/2014.1.1 updated on 2014-06-09
181. By Corey Bryant on 2014-06-09

* debian/patches/fix-requirements.patch: Refreshed.
* Resynchronize with stable/icehouse (aa0e752) (LP: #1328134):
  - [d58abc1] Update cinder.conf
  - [5330d3b] Updated from global requirements
  - [41127fb] Properly initialize rpc in cinder-volume-usage-audit
  - [75fa69d] Storwize/SVC driver crashes when check volume copy status
  - [bc585a0] Fix solaris_execute in SolarisISCSIDriver.
  - [bc0442a] Fix wrong exception reference
  - [59fe59e] Correct metadata ordering issue in tests
  - [1e48833] Fallback to None on missing Glance image attrs
  - [767c2a6] Keep volume available if retype fails due to quota
  - [d0602f6] Fixes cinder error state volume delete on Windows
  - [1815c72] Re-raise exceptions in upload-to-image
  - [560740f] GlusterFS: Delete active snapshot file on volume delete.
  - [d17277d] Add exception catch if Storwize/SVC driver failed when retyping
  - [49446bc] Disable oslo.messaging debug logs
  - [aa0e752] Adjust sample config for keystoneclient 0.8.0 release

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-04-17 10:32:18 +0000
3+++ debian/changelog 2014-06-09 18:43:44 +0000
4@@ -1,3 +1,25 @@
5+cinder (1:2014.1.1-0ubuntu1) trusty; urgency=medium
6+
7+ * debian/patches/fix-requirements.patch: Refreshed.
8+ * Resynchronize with stable/icehouse (aa0e752) (LP: #1328134):
9+ - [d58abc1] Update cinder.conf
10+ - [5330d3b] Updated from global requirements
11+ - [41127fb] Properly initialize rpc in cinder-volume-usage-audit
12+ - [75fa69d] Storwize/SVC driver crashes when check volume copy status
13+ - [bc585a0] Fix solaris_execute in SolarisISCSIDriver.
14+ - [bc0442a] Fix wrong exception reference
15+ - [59fe59e] Correct metadata ordering issue in tests
16+ - [1e48833] Fallback to None on missing Glance image attrs
17+ - [767c2a6] Keep volume available if retype fails due to quota
18+ - [d0602f6] Fixes cinder error state volume delete on Windows
19+ - [1815c72] Re-raise exceptions in upload-to-image
20+ - [560740f] GlusterFS: Delete active snapshot file on volume delete.
21+ - [d17277d] Add exception catch if Storwize/SVC driver failed when retyping
22+ - [49446bc] Disable oslo.messaging debug logs
23+ - [aa0e752] Adjust sample config for keystoneclient 0.8.0 release
24+
25+ -- Corey Bryant <corey.bryant@canonical.com> Mon, 09 Jun 2014 14:39:03 -0400
26+
27 cinder (1:2014.1-0ubuntu1) trusty; urgency=medium
28
29 * New upstream release (LP: #1299055).
30
31=== modified file 'debian/patches/fix-requirements.patch'
32--- debian/patches/fix-requirements.patch 2014-03-26 14:31:55 +0000
33+++ debian/patches/fix-requirements.patch 2014-06-09 18:43:44 +0000
34@@ -1,13 +1,14 @@
35-diff --git a/requirements.txt b/requirements.txt
36-index 956c5de..1033d31 100644
37---- a/requirements.txt
38-+++ b/requirements.txt
39-@@ -22,7 +22,6 @@ python-swiftclient>=1.6
40+Index: cinder/requirements.txt
41+===================================================================
42+--- cinder.orig/requirements.txt 2014-06-09 14:41:57.268598007 -0400
43++++ cinder/requirements.txt 2014-06-09 14:42:20.900598907 -0400
44+@@ -22,8 +22,7 @@
45 requests>=1.1
46 Routes>=1.12.3
47 taskflow>=0.1.3,<0.2
48 -rtslib-fb>=2.1.39
49- six>=1.5.2
50+-six>=1.6.0
51++six>=1.5.2
52 SQLAlchemy>=0.7.8,<=0.9.99
53 sqlalchemy-migrate>=0.8.2,!=0.8.4
54-
55+ stevedore>=0.14

Subscribers

People subscribed via source and target branches