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

Proposed by Corey Bryant on 2014-10-03
Status: Merged
Merged at revision: 184
Proposed branch: lp:~corey.bryant/cinder/2014.1.3
Merge into: lp:~ubuntu-server-dev/cinder/icehouse
Diff against target: 52 lines (+26/-3)
2 files modified
debian/changelog (+25/-0)
debian/patches/fix-requirements.patch (+1/-3)
To merge this branch: bzr merge lp:~corey.bryant/cinder/2014.1.3
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-10-03 Pending
Review via email: mp+237087@code.launchpad.net
To post a comment you must log in.

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-08-12 15:01:44 +0000
3+++ debian/changelog 2014-10-03 15:07:43 +0000
4@@ -1,3 +1,28 @@
5+cinder (1:2014.1.3-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Resynchronize with stable/icehouse (360705a) (LP: #1377136):
8+ - [7eef596] Refuse invalid qcow2 backing files
9+ - [8f7823d] Fixes terminate_connection live migration issue
10+ - [db5a25d] NetApp NFS: Do not reference dst_img_local before assignment
11+ - [ec249ee] Sync latest process and str utils from oslo
12+ - [d3b1102] Fix KeyError exception in NetApp CDOT iscsi driver volume create.
13+ - [1604b49] Don't clear _mounted_shares list in remoteFS while updating
14+ - [da5c3e6] Update cinder.conf.sample
15+ - [8178590] Block sqlalchemy-migrate 0.9.2
16+ - [5863f52] Mock glance client object in version unit tests
17+ - [03573a0] VMware: Disable suds caching
18+ - [c282636] Honor volume:get policy
19+ - [da65d08] Prevent tenant viewing volumes owned by another
20+ - [5f88296] Fix performance issues with brocade zone driver.
21+ - [36406c9] Cache snapshots in request for extension
22+ - [ce35e7a] volume_image_metadata missing from volume list
23+ - [69ade10] Add retry_on_deadlock to db update methods
24+ - [3b4d5b0] Add fix for reservation index to icehouse
25+ - [360705a] vmware: Force chunked transfer for upload-to-image
26+ * d/p/fix-requirements.patch: Rebased.
27+
28+ -- Corey Bryant <corey.bryant@canonical.com> Fri, 03 Oct 2014 10:22:42 -0400
29+
30 cinder (1:2014.1.2-0ubuntu1) trusty; urgency=medium
31
32 [ Corey Bryant ]
33
34=== modified file 'debian/patches/fix-requirements.patch'
35--- debian/patches/fix-requirements.patch 2014-08-11 13:52:19 +0000
36+++ debian/patches/fix-requirements.patch 2014-10-03 15:07:43 +0000
37@@ -3,8 +3,6 @@
38 six: 1.5.2 present in 14.04, features of 1.6.0 not used.
39 Forwarded: not-needed
40
41-Index: cinder/requirements.txt
42-===================================================================
43 --- a/requirements.txt
44 +++ b/requirements.txt
45 @@ -22,8 +22,7 @@
46@@ -15,5 +13,5 @@
47 -six>=1.6.0
48 +six>=1.5.2
49 SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
50- sqlalchemy-migrate>=0.8.2,!=0.8.4
51+ sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2
52 stevedore>=0.14

Subscribers

People subscribed via source and target branches