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
=== modified file 'debian/changelog'
--- debian/changelog 2015-08-04 13:53:06 +0000
+++ debian/changelog 2015-08-04 14:55:40 +0000
@@ -1,3 +1,20 @@
1glance (1:2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
2
3 * Resynchronize with stable/kilo (45f9132) (LP: #1481008):
4 - [899a8b9] Remove usage of assert_called_once in mocks
5 - [d1f54b7] Fix OSProfiler exception when is enabled
6 - [5baf018] Add client_socket_timeout option
7 - [abc2a0c] Change status code from 500 to 400 for image update request
8 - [88f92eb] Save image data after setting the data
9 - [9faec58] Make sure the converted image is imported
10 - [a6f4a9c] Remove ordereddict from requirements
11 - [a102ebe] Fixed error message for negative values of min_disk and min_ram
12 - [870e2d5] Return empty str for permissive, none, properties
13 - [45f9132] Fix test_opts to not resolve requirements
14 * d/p/fix-requirements.patch: Dropped. No longer needed.
15
16 -- Corey Bryant <corey.bryant@canonical.com> Tue, 04 Aug 2015 10:31:54 -0400
17
1glance (1:2015.1.0-0ubuntu2) vivid; urgency=medium18glance (1:2015.1.0-0ubuntu2) vivid; urgency=medium
219
3 * d/p/0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch: 20 * d/p/0001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch:
421
=== removed file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch 2015-04-10 18:17:03 +0000
+++ debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
1diff -Naurp glance-2015.1.0rc1.orig/requirements.txt glance-2015.1.0rc1/requirements.txt
2--- glance-2015.1.0rc1.orig/requirements.txt 2015-04-10 11:49:16.000000000 -0400
3+++ glance-2015.1.0rc1/requirements.txt 2015-04-10 14:14:36.411750864 -0400
4@@ -21,7 +21,6 @@ httplib2>=0.7.5
5 kombu>=2.5.0
6 pycrypto>=2.6
7 iso8601>=0.1.9
8-ordereddict
9 oslo.config>=1.9.3,<1.10.0 # Apache-2.0
10 oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0
11 oslo.context>=0.2.0,<0.3.0 # Apache-2.0
120
=== modified file 'debian/patches/series'
--- debian/patches/series 2015-08-04 13:54:24 +0000
+++ debian/patches/series 2015-08-04 14:55:40 +0000
@@ -1,3 +1,2 @@
1sql_conn.patch1sql_conn.patch
2fix-requirements.patch
30001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch20001-Allow-ramdisk_id-kernel_id-to-be-null-on-schema.patch

Subscribers

People subscribed via source and target branches