Merge lp:~thedac/cinder/kilo into lp:~ubuntu-server-dev/cinder/kilo

Proposed by David Ames on 2015-08-03
Status: Merged
Merged at revision: 233
Proposed branch: lp:~thedac/cinder/kilo
Merge into: lp:~ubuntu-server-dev/cinder/kilo
Diff against target: 61 lines (+38/-6)
2 files modified
debian/changelog (+32/-0)
debian/patches/fix-requirements.patch (+6/-6)
To merge this branch: bzr merge lp:~thedac/cinder/kilo
Reviewer Review Type Date Requested Status
Corey Bryant 2015-08-03 Approve on 2015-08-03
Review via email: mp+266779@code.launchpad.net

Description of the change

Releasing package cinder version 1:2015.1.1-0ubuntu1

To post a comment you must log in.
Corey Bryant (corey.bryant) wrote :

Thanks David. Looking pretty good. A couple of comments below.

lp:~thedac/cinder/kilo updated on 2015-08-03
234. By David Ames on 2015-08-03

Changelog fixes

Corey Bryant (corey.bryant) wrote :

Looks good, thanks!

review: Approve

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 2015-05-03 17:40:59 +0000
3+++ debian/changelog 2015-08-03 20:28:55 +0000
4@@ -1,3 +1,35 @@
5+cinder (1:2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Resynchronize with stable/kilo (651bab0) (LP: #1481008):
8+ - [b130f00] Fix NetApp cDOT driver use of Glance locations
9+ - [3388fff] Volume manager should set filter_function and goodness_function
10+ - [08ff005] Update expected error message from lvs
11+ - [27b5e75] Revert "Graceful shutdown WSGI/RPC server"
12+ - [4f86ae7] Fix 'no actual-pathname' NetApp API error
13+ - [70c6a35] Graceful shutdown WSGI/RPC server
14+ - [6c05594] Add exception catch in report_state for DBError
15+ - [50db0fc] Fix broken export commands on block_device driver
16+ - [9634b76] Disallow backing files when uploading volumes to image
17+ - [223b258] Fix cinder concurrency issues on rtstool
18+ - [ea9e2e0] Create iSCSI lio portals with right IPs and port
19+ - [f8149fc] Dispose DB connections between backend proc starts
20+ - [28bb8d2] Allow provisioning to reach max oversubscription
21+ - [0490f1c] Create initiator id for VMAX iSCSI driver
22+ - [28df54c] Fix capacity filter to allow oversubscription
23+ - [c56bbb7] VMware: Fix missing target resource pool
24+ - [03562c3] Check volume_backend in retype
25+ - [5ff9497] Use nfs_oversub_ratio when reporting pool capacity
26+ - [9affeaf] NFS Backup: Correcting backup_sha_block_size_bytes help message
27+ - [c0f12f2] LVM: Pass volume size in MiB to copy_volume() during volume migration
28+ - [e316d6f] Dell: Added support for update_migrated_volume
29+ - [f0a4447] Allow rexports for targets with Datera
30+ - [dabbaed] HDS HNAS Driver fails when FS unhealthy
31+ - [a5908fd] Revert state if attachment already exists
32+ - [651bab0] VolMgr: reschedule only when filter_properties has retry
33+ * d/p/fix-requirements.patch: Rebased.
34+
35+ -- David Ames <david.ames@canonical.com> Mon, 03 Aug 2015 10:43:21 -0700
36+
37 cinder (1:2015.1.0-0ubuntu1) vivid; urgency=medium
38
39 [ Chuck Short ]
40
41=== modified file 'debian/patches/fix-requirements.patch'
42--- debian/patches/fix-requirements.patch 2015-04-20 13:13:50 +0000
43+++ debian/patches/fix-requirements.patch 2015-08-03 20:28:55 +0000
44@@ -1,11 +1,11 @@
45 --- a/requirements.txt
46 +++ b/requirements.txt
47-@@ -34,7 +34,7 @@ python-novaclient>=2.22.0,<2.24.0
48- python-swiftclient>=2.2.0,<2.5.0
49- requests>=2.2.0,!=2.4.0
50- retrying>=1.2.3,!=1.3.0 # Apache-2.0
51--Routes>=1.12.3,!=2.0
52+@@ -34,7 +34,7 @@
53+ python-swiftclient<2.5.0,>=2.2.0
54+ requests!=2.4.0,>=2.2.0
55+ retrying!=1.3.0,>=1.2.3 # Apache-2.0
56+-Routes!=2.0,>=1.12.3
57 +Routes>=1.12.3
58- taskflow>=0.7.1,<0.8.0
59+ taskflow<0.8.0,>=0.7.1
60 rtslib-fb>=2.1.41
61 six>=1.9.0

Subscribers

People subscribed via source and target branches