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

Proposed by Corey Bryant on 2014-08-08
Status: Merged
Merged at revision: 182
Proposed branch: lp:~corey.bryant/cinder/2014.1.2
Merge into: lp:~ubuntu-server-dev/cinder/icehouse
Diff against target: 97 lines (+34/-20)
3 files modified
debian/changelog (+33/-0)
debian/cinder_sudoers (+1/-1)
debian/patches/fix-requirements.patch (+0/-19)
To merge this branch: bzr merge lp:~corey.bryant/cinder/2014.1.2
Reviewer Review Type Date Requested Status
Chuck Short (community) 2014-08-08 Needs Fixing on 2014-08-08
Review via email: mp+230123@code.launchpad.net
To post a comment you must log in.
Chuck Short (zulcss) wrote :

Can you resync with what we have in the archive.

review: Needs Fixing
Corey Bryant (corey.bryant) wrote :

> Can you resync with what we have in the archive.

Chuck, thanks for reviewing. I've resync'd and pushed a new version that is ready for review.

lp:~corey.bryant/cinder/2014.1.2 updated on 2014-08-11
182. By Corey Bryant on 2014-08-11

* Resynchronize with stable/icehouse (00d456b) (LP: #1354159):
  - [a1135b7] Fix solidfire accept_transfer
  - [00b7574] Fixes HP LeftHand driver with Paramiko 1.13.0
  - [22e451b] Set python hash seed to 0 in tox.ini
  - [cd7dd94] Get updated model info on volume transfer
  - [f6df82c] Ensure flushing of IO prior to removing FC device
  - [63ba651] Don't leave snapshots on the floor
  - [c74efd7] Retry lvremove with ignore_suspended_devices
  - [fe37a6e] Remove second get call to list/show volumes
  - [1d80539] Add cinder-manage cmd to update host column
  - [d12c513] Fix host option isn't set when using multiple backend
  - [570c90f] Add the -f option back to lvremove
  - [170632f] Update requirements.txt to disallow alpha libs
  - [04c7431] Allow host config to be overriden in backend
  - [f96e991] Storwize/SVC driver detach volume failed
  - [c4d3c1c] Fix handling multiple WWPNs on preferred FC node
  - [3877a73] vmware: Fix problems with VIM API retry logic
  - [cab4ef6] Specify lld in tgt config backends
  - [d4392f3] Fix retyping volume that has volume type None
  - [d6829c1] Ensure that lun_id is an int
  - [00d456b] GET details REST API next link missing 'details'
* d/p/fix-requirements.patch: Refreshed.
* SECURITY UPDATE: specify /etc/cinder/rootwrap.conf for use with
  cinder-rootwrap
  - CVE-2013-1068 (LP: #1185019)

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-06-16 08:01:30 +0000
3+++ debian/changelog 2014-08-11 13:52:39 +0000
4@@ -1,3 +1,36 @@
5+cinder (1:2014.1.2-0ubuntu1) trusty; urgency=medium
6+
7+ [ Corey Bryant ]
8+ * Resynchronize with stable/icehouse (00d456b) (LP: #1354159):
9+ - [a1135b7] Fix solidfire accept_transfer
10+ - [00b7574] Fixes HP LeftHand driver with Paramiko 1.13.0
11+ - [22e451b] Set python hash seed to 0 in tox.ini
12+ - [cd7dd94] Get updated model info on volume transfer
13+ - [f6df82c] Ensure flushing of IO prior to removing FC device
14+ - [63ba651] Don't leave snapshots on the floor
15+ - [c74efd7] Retry lvremove with ignore_suspended_devices
16+ - [fe37a6e] Remove second get call to list/show volumes
17+ - [1d80539] Add cinder-manage cmd to update host column
18+ - [d12c513] Fix host option isn't set when using multiple backend
19+ - [570c90f] Add the -f option back to lvremove
20+ - [170632f] Update requirements.txt to disallow alpha libs
21+ - [04c7431] Allow host config to be overriden in backend
22+ - [f96e991] Storwize/SVC driver detach volume failed
23+ - [c4d3c1c] Fix handling multiple WWPNs on preferred FC node
24+ - [3877a73] vmware: Fix problems with VIM API retry logic
25+ - [cab4ef6] Specify lld in tgt config backends
26+ - [d4392f3] Fix retyping volume that has volume type None
27+ - [d6829c1] Ensure that lun_id is an int
28+ - [00d456b] GET details REST API next link missing 'details'
29+ * d/p/fix-requirements.patch: Refreshed.
30+
31+ [ Jamie Strandboge <jamie@ubuntu.com> ]
32+ * SECURITY UPDATE: specify /etc/cinder/rootwrap.conf for use with
33+ cinder-rootwrap
34+ - CVE-2013-1068 (LP: #1185019)
35+
36+ -- Corey Bryant <corey.bryant@canonical.com> Fri, 08 Aug 2014 11:21:47 -0400
37+
38 cinder (1:2014.1.1-0ubuntu1) trusty; urgency=medium
39
40 * Resynchronize with stable/icehouse (aa0e752) (LP: #1328134):
41
42=== modified file 'debian/cinder_sudoers'
43--- debian/cinder_sudoers 2012-07-07 07:49:54 +0000
44+++ debian/cinder_sudoers 2014-08-11 13:52:39 +0000
45@@ -1,3 +1,3 @@
46 Defaults:cinder !requiretty
47
48-cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap
49+cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap /etc/cinder/rootwrap.conf *
50
51=== added file 'debian/patches/fix-requirements.patch'
52--- debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
53+++ debian/patches/fix-requirements.patch 2014-08-11 13:52:39 +0000
54@@ -0,0 +1,19 @@
55+Description: Requirement alignment for Ubuntu 14.04
56+ rtslib-fb: not supported in Ubuntu, dropped.
57+ six: 1.5.2 present in 14.04, features of 1.6.0 not used.
58+Forwarded: not-needed
59+
60+Index: cinder/requirements.txt
61+===================================================================
62+--- a/requirements.txt
63++++ b/requirements.txt
64+@@ -22,8 +22,7 @@
65+ requests>=1.1
66+ Routes>=1.12.3,!=2.0
67+ taskflow>=0.1.3,<0.2
68+-rtslib-fb>=2.1.39
69+-six>=1.6.0
70++six>=1.5.2
71+ SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
72+ sqlalchemy-migrate>=0.8.2,!=0.8.4
73+ stevedore>=0.14
74
75=== removed file 'debian/patches/fix-requirements.patch'
76--- debian/patches/fix-requirements.patch 2014-06-16 08:01:30 +0000
77+++ debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
78@@ -1,19 +0,0 @@
79-Description: Requirement alignment for Ubuntu 14.04
80- rtslib-fb: not supported in Ubuntu, dropped.
81- six: 1.5.2 present in 14.04, features of 1.6.0 not used.
82-Forwarded: not-needed
83-
84-Index: cinder/requirements.txt
85-===================================================================
86---- cinder.orig/requirements.txt 2014-06-09 14:41:57.268598007 -0400
87-+++ cinder/requirements.txt 2014-06-09 14:42:20.900598907 -0400
88-@@ -22,8 +22,7 @@
89- requests>=1.1
90- Routes>=1.12.3
91- taskflow>=0.1.3,<0.2
92--rtslib-fb>=2.1.39
93--six>=1.6.0
94-+six>=1.5.2
95- SQLAlchemy>=0.7.8,<=0.9.99
96- sqlalchemy-migrate>=0.8.2,!=0.8.4
97- stevedore>=0.14

Subscribers

People subscribed via source and target branches