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

Proposed by Corey Bryant on 2015-08-03
Status: Merged
Merged at revision: 779
Proposed branch: lp:~corey.bryant/nova/2015.1.1
Merge into: lp:~ubuntu-server-dev/nova/kilo
Diff against target: 113 lines (+50/-42)
3 files modified
debian/changelog (+50/-0)
debian/patches/fixup-blkid.patch (+0/-41)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~corey.bryant/nova/2015.1.1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2015-08-03 Pending
Review via email: mp+266799@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-07-06 10:58:10 +0000
3+++ debian/changelog 2015-08-03 20:11:13 +0000
4@@ -1,3 +1,53 @@
5+nova (1:2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Resynchronize with stable/kilo (d8a470d) (LP: #1481008):
8+ - [e6e39e1] Remove incorrect Instance 1.18 relationship for PciDevice 1.2
9+ - [a55ea8c] Fix the incorrect PciDeviceList version number
10+ - [e56aed8] Add support for forcing migrate_flavor_data
11+ - [ccd002b] Fix migrate_flavor_data string substitution
12+ - [124b501] Allow libvirt cleanup completion when serial ports already released
13+ - [4908d46] Fixed incorrect dhcp_server value during nova-network creation
14+ - [0cf44ff] Fixed nova-network dhcp-hostsfile update during live-migration
15+ - [dc6af6b] libvirt: handle code=38 + sigkill (ebusy) in destroy()
16+ - [6e22a8b] hypervisor support matrix: add kvm on system z in kilo release
17+ - [e013ebf] Fix max_number for migrate_flavor data
18+ - [2b5fe5d] Reduce window for allocate_fixed_ip / release_fixed_ip race in nova-net
19+ - [cd6353a] Mark ironic credential config as secret
20+ - [48a6217] Ensure to store context in thread local after spawn/spawn_n
21+ - [fc7f1ab] Store context in local store after spawn_n
22+ - [199f0ab] Fixes TypeError when libvirt version is BAD_LIBVIRT_CPU_POLICY_VERSIONS
23+ - [1f4088d] Add 'docker' to the list of known hypervisor types
24+ - [30fe27d] Fix noVNC console access for an IPv6 setup
25+ - [41ba203] libvirt: Don't try to confine a non-NUMA instance
26+ - [2635ee0] Fix quota-update stuck in deleting when nova-compute startup finish
27+ - [540221f] Remove useless volume when boot from volume failed
28+ - [4bb1e08] network: fix instance cache refresh for empty list
29+ - [22adc62] Make nova-manage handle completely missing flavor information
30+ - [c66c8e1] libvirt: safe_decode xml for i18n logging
31+ - [c42b47e] Reschedules sometimes do not allocate networks
32+ - [72f7e30] Hyper-V: Fixes cold migration / resize issue
33+ - [a0f093a] Create instance_extra entry if it doesn't update
34+ - [6463b38] Don't wait for an event on a resize-revert
35+ - [d55ee5a] Ironic: pass injected files through to configdrive
36+ - [e7519b4] Associate floating IPs with first v4 fixed IP if none specified
37+ - [d18058e] libvirt: handle NotSupportedError in compareCPU
38+ - [1a6053b] fix network setup on evacuate
39+ - [aaaf7ce] Delete shelved_* keys in n-cpu unshelve call
40+ - [82f83d4] Correct the help text for the compute option.
41+ - [8ba0159] Fix loading things in instance_extra for old instances
42+ - [709f0bb] Delay STOPPED lifecycle event for all domains, not just Xen
43+ - [1b941f1] Handle return code 2 from blkid calls
44+ - [8e9ecf7] Libvirt: Use tpool to invoke guestfs api
45+ - [7ae9466] Incorrect argument order passed to swap_volume
46+ - [c363c2d] VMWare: Isolate unit tests from requests
47+ - [e896c5a] Make test_version_string_with_package_is_good work with pbr 0.11
48+ - [cbf606b] view hypervisor details rest api should be allowed for non-admins
49+ - [c1b6e1a] sync oslo: service child process normal SIGTERM exit
50+ - [d8a470d] Hyper-V: checks for existent Notes in list_instance_notes
51+ * d/p/fixup-blkid.patch: Dropped. Fixed upstream.
52+
53+ -- Corey Bryant <corey.bryant@canonical.com> Mon, 03 Aug 2015 14:30:20 -0400
54+
55 nova (1:2015.1.0-0ubuntu1.1) vivid; urgency=medium
56
57 * d/nova-compute.upstart.in: Fix (another) race between nova-compute
58
59=== removed file 'debian/patches/fixup-blkid.patch'
60--- debian/patches/fixup-blkid.patch 2015-03-20 11:30:33 +0000
61+++ debian/patches/fixup-blkid.patch 1970-01-01 00:00:00 +0000
62@@ -1,41 +0,0 @@
63-From 27bbef87c4f0830c04844b1e4b0b2619a9e37530 Mon Sep 17 00:00:00 2001
64-From: James Page <james.page@ubuntu.com>
65-Date: Fri, 27 Feb 2015 11:27:30 +0000
66-Subject: [PATCH] Handle return code 2 from blkid calls
67-
68-blkid returns code 2 if the requested TYPE key is not found
69-for the specified device.
70-
71-Ensure that this situation is handled correctly; blkid will
72-not return any data, so the return value will be empty.
73-
74-Change-Id: I38cd7b53cdfd694c0eba1b6054d8e4c33759b0b8
75-Closes-Bug: #1426324
76----
77- nova/tests/unit/virt/disk/vfs/test_localfs.py | 3 ++-
78- nova/virt/disk/vfs/localfs.py | 3 ++-
79- 2 files changed, 4 insertions(+), 2 deletions(-)
80-
81---- a/nova/tests/unit/virt/disk/vfs/test_localfs.py
82-+++ b/nova/tests/unit/virt/disk/vfs/test_localfs.py
83-@@ -416,7 +416,8 @@ class VirtDiskVFSLocalFSTest(test.NoDBTe
84- execute.assert_called_once_with('blkid', '-o',
85- 'value', '-s',
86- 'TYPE', '/dev/xyz',
87-- run_as_root=True)
88-+ run_as_root=True,
89-+ check_exit_code=[0, 2])
90-
91- @mock.patch.object(tempfile, 'mkdtemp')
92- @mock.patch.object(nova.virt.disk.mount.nbd, 'NbdMount')
93---- a/nova/virt/disk/vfs/localfs.py
94-+++ b/nova/virt/disk/vfs/localfs.py
95-@@ -164,6 +164,7 @@ class VFSLocalFS(vfs.VFS):
96- out, err = utils.execute('blkid', '-o',
97- 'value', '-s',
98- 'TYPE', self.mount.device,
99-- run_as_root=True)
100-+ run_as_root=True,
101-+ check_exit_code=[0, 2])
102- return out.strip()
103- return ""
104
105=== modified file 'debian/patches/series'
106--- debian/patches/series 2015-03-30 10:21:05 +0000
107+++ debian/patches/series 2015-08-03 20:11:13 +0000
108@@ -6,5 +6,4 @@
109 skip-cinder-tests.patch
110 #rate-limit-power-syncs.patch
111 skip-ubuntu-tests.patch
112-fixup-blkid.patch
113 skip-proxy-test.patch

Subscribers

People subscribed via source and target branches