Merge lp:~corey.bryant/glance/2015.1.1 into lp:~ubuntu-server-dev/glance/kilo

Proposed by Corey Bryant on 2015-08-04
Status: Merged
Merged at revision: 340
Proposed branch: lp:~corey.bryant/glance/2015.1.1
Merge into: lp:~ubuntu-server-dev/glance/kilo
Diff against target: 48 lines (+17/-12)
3 files modified
debian/changelog (+17/-0)
debian/patches/fix-requirements.patch (+0/-11)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~corey.bryant/glance/2015.1.1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2015-08-04 Pending
Review via email: mp+266890@code.launchpad.net
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 2015-08-04 13:53:06 +0000
3+++ debian/changelog 2015-08-04 14:55:40 +0000
4@@ -1,3 +1,20 @@
5+glance (1:2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Resynchronize with stable/kilo (45f9132) (LP: #1481008):
8+ - [899a8b9] Remove usage of assert_called_once in mocks
9+ - [d1f54b7] Fix OSProfiler exception when is enabled
10+ - [5baf018] Add client_socket_timeout option
11+ - [abc2a0c] Change status code from 500 to 400 for image update request
12+ - [88f92eb] Save image data after setting the data
13+ - [9faec58] Make sure the converted image is imported
14+ - [a6f4a9c] Remove ordereddict from requirements
15+ - [a102ebe] Fixed error message for negative values of min_disk and min_ram
16+ - [870e2d5] Return empty str for permissive, none, properties
17+ - [45f9132] Fix test_opts to not resolve requirements
18+ * d/p/fix-requirements.patch: Dropped. No longer needed.
19+
20+ -- Corey Bryant <corey.bryant@canonical.com> Tue, 04 Aug 2015 10:31:54 -0400
21+
22 glance (1:2015.1.0-0ubuntu2) vivid; urgency=medium
23
24 * d/p/0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch:
25
26=== removed file 'debian/patches/fix-requirements.patch'
27--- debian/patches/fix-requirements.patch 2015-04-10 18:17:03 +0000
28+++ debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
29@@ -1,11 +0,0 @@
30-diff -Naurp glance-2015.1.0rc1.orig/requirements.txt glance-2015.1.0rc1/requirements.txt
31---- glance-2015.1.0rc1.orig/requirements.txt 2015-04-10 11:49:16.000000000 -0400
32-+++ glance-2015.1.0rc1/requirements.txt 2015-04-10 14:14:36.411750864 -0400
33-@@ -21,7 +21,6 @@ httplib2>=0.7.5
34- kombu>=2.5.0
35- pycrypto>=2.6
36- iso8601>=0.1.9
37--ordereddict
38- oslo.config>=1.9.3,<1.10.0 # Apache-2.0
39- oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0
40- oslo.context>=0.2.0,<0.3.0 # Apache-2.0
41
42=== modified file 'debian/patches/series'
43--- debian/patches/series 2015-08-04 13:54:24 +0000
44+++ debian/patches/series 2015-08-04 14:55:40 +0000
45@@ -1,3 +1,2 @@
46 sql_conn.patch
47-fix-requirements.patch
48 0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch

Subscribers

People subscribed via source and target branches