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

Proposed by Corey Bryant on 2014-06-09
Status: Merged
Merged at revision: 296
Proposed branch: lp:~corey.bryant/glance/2014.1.1
Merge into: lp:~ubuntu-server-dev/glance/icehouse
Diff against target: 44 lines (+25/-0)
3 files modified
debian/changelog (+9/-0)
debian/patches/fix-requirements.patch (+15/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~corey.bryant/glance/2014.1.1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-06-09 Pending
Review via email: mp+222543@code.launchpad.net

Description of the change

Ubuntu Stable Release Update for OpenStack Icehouse

To post a comment you must log in.
lp:~corey.bryant/glance/2014.1.1 updated on 2014-06-13
296. By Corey Bryant on 2014-06-13

* Resynchronize with stable/icehouse (cd1c30a) (LP: #1328134):
  - [19de115] Prevent creation of http images with invalid URIs
  - [e96a53a] Fixes installation of test-requirements
  - [cd1c30a] Updated from global requirements

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 11:46:19 +0000
3+++ debian/changelog 2014-06-13 16:25:49 +0000
4@@ -1,3 +1,12 @@
5+glance (1:2014.1.1-0ubuntu1) trusty; urgency=medium
6+
7+ * Resynchronize with stable/icehouse (cd1c30a) (LP: #1328134):
8+ - [19de115] Prevent creation of http images with invalid URIs
9+ - [e96a53a] Fixes installation of test-requirements
10+ - [cd1c30a] Updated from global requirements
11+
12+ -- Corey Bryant <corey.bryant@canonical.com> Mon, 09 Jun 2014 14:55:05 -0400
13+
14 glance (1:2014.1-0ubuntu1) trusty; urgency=medium
15
16 * New upstream release (LP: #1299055).
17
18=== added file 'debian/patches/fix-requirements.patch'
19--- debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
20+++ debian/patches/fix-requirements.patch 2014-06-13 16:25:49 +0000
21@@ -0,0 +1,15 @@
22+Description: Set min version of six.
23+Author: Corey Bryant <corey.bryant@canonical.com>
24+Forwarded: Not needed.
25+Index: glance/requirements.txt
26+===================================================================
27+--- glance.orig/requirements.txt 2014-06-13 10:13:33.028556468 -0400
28++++ glance/requirements.txt 2014-06-13 11:33:56.440409418 -0400
29+@@ -38,6 +38,6 @@
30+ pyOpenSSL>=0.11
31+
32+ # Required by openstack.common libraries
33+-six>=1.6.0
34++six>=1.5.2
35+
36+ oslo.messaging>=1.3.0a9
37
38=== modified file 'debian/patches/series'
39--- debian/patches/series 2014-04-12 12:45:23 +0000
40+++ debian/patches/series 2014-06-13 16:25:49 +0000
41@@ -1,2 +1,3 @@
42 sql_conn.patch
43 skip-tests.patch
44+fix-requirements.patch

Subscribers

People subscribed via source and target branches