Merge lp:~gandelman-a/ubuntu/saucy/glance/2013.2.1 into lp:~ubuntu-server-dev/glance/havana

Proposed by Adam Gandelman on 2013-12-19
Status: Merged
Approved by: Chuck Short on 2014-01-02
Approved revision: 269
Merged at revision: 269
Proposed branch: lp:~gandelman-a/ubuntu/saucy/glance/2013.2.1
Merge into: lp:~ubuntu-server-dev/glance/havana
Diff against target: 21 lines (+12/-1)
1 file modified
debian/changelog (+12/-1)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/saucy/glance/2013.2.1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2013-12-19 Pending
Review via email: mp+199715@code.launchpad.net

Description of the change

2013.2.1

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 2013-12-18 18:33:29 +0000
3+++ debian/changelog 2013-12-19 20:32:50 +0000
4@@ -1,5 +1,16 @@
5-glance (1:2013.2.1-0ubuntu1) UNRELEASED; urgency=low
6+glance (1:2013.2.1-0ubuntu1) saucy-proposed; urgency=low
7
8+ * Resynchronize with stable/havana (949cda0) (LP: #1262788):
9+ - [252fe85] Open stable/havana
10+ - [e20b2af] Qpid protocol configuration is wrong LP: 1243821
11+ - [0f66c54] Error message encoding issue when using qpid LP: 1242734
12+ - [5b8f18b] Wrong parameter in the config file s/qpid_host/qpid_hostname/
13+ LP: 1242715
14+ - [9b52a89] Jenkins failed due to
15+ TestGlanceAPI.test_get_details_filter_changes_since LP: 1242501
16+ - [949cda0] Updated from global requirements
17+ - [5cd7a22] Bump stable/havana next version to 2013.2.2
18+ - [949cda0] Updated from global requirements
19 * d/p/debian/patches/revert_upstream_iso8601_fixes.patch: Reverts
20 patch that was committed to allow tests to pass in upstreams
21 gate using a newer version of python-iso8601. Ubuntu's version

Subscribers

People subscribed via source and target branches