Merge lp:~zulcss/ubuntu/saucy/glance/2013.2.2 into lp:~ubuntu-server-dev/glance/havana

Proposed by Chuck Short on 2014-02-25
Status: Merged
Merged at revision: 270
Proposed branch: lp:~zulcss/ubuntu/saucy/glance/2013.2.2
Merge into: lp:~ubuntu-server-dev/glance/havana
Diff against target: 50 lines (+17/-3)
1 file modified
debian/changelog (+17/-3)
To merge this branch: bzr merge lp:~zulcss/ubuntu/saucy/glance/2013.2.2
Reviewer Review Type Date Requested Status
James Page 2014-02-25 Needs Fixing on 2014-02-25
Review via email: mp+208153@code.launchpad.net

Description of the change

2013.2.2

To post a comment you must log in.
James Page (james-page) wrote :

Changelog need fixing - its not 2013.2.2 and some of the 2013.2.1 changes have been dropped from the log.

review: Needs Fixing
271. By Chuck Short on 2014-02-25

Update

272. By Chuck Short on 2014-02-25

Fix changelog

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 2013-12-19 20:26:48 +0000
3+++ debian/changelog 2014-02-25 18:51:07 +0000
4@@ -1,3 +1,17 @@
5+glance (1:2013.2.2-0ubuntu1) saucy-proposed; urgency=low
6+
7+ * Resynchronize with stable/havana (9d89b8e) (LP: #1284643):
8+ - [5cd7a22] Bump stable/havana next version to 2013.2.2
9+ - [1a9e0e9] protected property change not rejected if a subsequent rule
10+ match accepts them LP: 1271426
11+ - [1982ca2] Openstack Glance: user_total_quota calculated incorrectly
12+ LP: 1261738
13+ - [edcbdf9] sensitive info in image location is logged when authentication
14+ to single tenant swift store fails LP: 1275062
15+ - [9d89b8e] Bump stable/havana next version to 2013.2.3
16+
17+ -- Chuck Short <zulcss@ubuntu.com> Tue, 25 Feb 2014 09:07:05 -0500
18+
19 glance (1:2013.2.1-0ubuntu1) saucy-proposed; urgency=low
20
21 * Resynchronize with stable/havana (949cda0) (LP: #1262788):
22@@ -13,13 +27,13 @@
23 - [949cda0] Updated from global requirements
24 * d/p/debian/patches/revert_upstream_iso8601_fixes.patch: Reverts
25 patch that was committed to allow tests to pass in upstreams
26- gate using a newer version of python-iso8601. Ubuntu's version
27+ gate using a newer version of python-iso8601. Ubuntu's version
28 is stable, the patch unncessary and causes failures.
29 * debian/patches/revert-stable-havana-requirements.patch: Revert
30 version bumps to dependencies in stable/havana back to what was
31 shipped with Saucy.
32
33- -- Adam Gandelman <adamg@ubuntu.com> Thu, 12 Dec 2013 12:52:40 -0800
34+ -- Adam Gandelman <adamg@ubuntu.com> Thu, 12 Dec 2013 12:52:40 -0800
35
36 glance (1:2013.2-0ubuntu1) saucy; urgency=low
37
38@@ -501,7 +515,6 @@
39
40 -- Matthias Klose <doko@ubuntu.com> Mon, 02 Jan 2012 13:02:24 +0100
41
42-
43 glance (2012.1~e2-0ubuntu2) precise; urgency=low
44
45 * debian/glance-registry.postinst: Fix typo in postinst.
46@@ -789,3 +802,4 @@
47 * Initial upload.
48
49 -- Soren Hansen <soren@ubuntu.com> Wed, 19 Jan 2011 12:01:32 +0100
50+

Subscribers

People subscribed via source and target branches