Glance

Merge lp:~corey.bryant/glance/2014.1.4 into lp:~ubuntu-server-dev/glance/icehouse

  1. 2014.1.4
  2. Merge into icehouse
Proposed by Corey Bryant
Status: Merged
Merged at revision: 300
Proposed branch: lp:~corey.bryant/glance/2014.1.4
Merge into: lp:~ubuntu-server-dev/glance/icehouse
Diff against target: 43 lines (+16/-4)
2 files modified
debian/changelog (+14/-0)
debian/patches/fix-requirements.patch (+2/-4)
To merge this branch: bzr merge lp:~corey.bryant/glance/2014.1.4
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+253094@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) :
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 2014-10-06 12:49:20 +0000
3+++ debian/changelog 2015-03-16 18:31:37 +0000
4@@ -1,3 +1,17 @@
5+glance (1:2014.1.4-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Resynchronize with stable/icehouse (81ea399) (LP: #1432608):
8+ - [f1260cc] Cleanup chunks for deleted image that was 'saving'
9+ - [7d3a1db] Prevent file, swift+config and filesystem schemes
10+ - [8bdb7ed] To prevent client use v2 patch api to handle file and swift location
11+ - [4b5cb74] Can not delete images if db deadlock occurs
12+ - [ef77c79] Move oslo.vmware higher in requirements.txt
13+ - [312e93e] Make rbd store's pool handling more universal
14+ - [81ea399] Do not log password in swift URLs in g-registry
15+ * d/p/fix-requirements.patch: Rebased
16+
17+ -- Corey Bryant <corey.bryant@canonical.com> Mon, 16 Mar 2015 14:12:46 -0400
18+
19 glance (1:2014.1.3-0ubuntu1) trusty; urgency=medium
20
21 [ Corey Bryant ]
22
23=== modified file 'debian/patches/fix-requirements.patch'
24--- debian/patches/fix-requirements.patch 2014-08-08 21:40:04 +0000
25+++ debian/patches/fix-requirements.patch 2015-03-16 18:31:37 +0000
26@@ -1,15 +1,13 @@
27 Description: Set min version of six.
28 Author: Corey Bryant <corey.bryant@canonical.com>
29 Forwarded: Not needed.
30-Index: glance/requirements.txt
31-===================================================================
32 --- a/requirements.txt
33 +++ b/requirements.txt
34-@@ -38,6 +38,6 @@
35+@@ -39,6 +39,6 @@
36 pyOpenSSL>=0.11
37
38 # Required by openstack.common libraries
39 -six>=1.6.0
40 +six>=1.5.2
41
42- oslo.messaging>=1.3.0
43+ oslo.messaging>=1.3.0,<1.5

Subscribers

People subscribed via source and target branches