Merge lp:~corey.bryant/nova/2015.1-b1-0ubuntu5 into lp:~ubuntu-server-dev/nova/kilo

Proposed by Corey Bryant
Status: Merged
Merged at revision: 755
Proposed branch: lp:~corey.bryant/nova/2015.1-b1-0ubuntu5
Merge into: lp:~ubuntu-server-dev/nova/kilo
Diff against target: 32 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~corey.bryant/nova/2015.1-b1-0ubuntu5
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+246456@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-01-12 08:32:19 +0000
3+++ debian/changelog 2015-01-14 16:09:03 +0000
4@@ -1,3 +1,10 @@
5+nova (1:2015.1~b1-0ubuntu5) UNRELEASED; urgency=medium
6+
7+ * Rebuild to pick up pkgos upstart generation fix.
8+ - d/control: Bump openstack-pkg-tools to ensure upstart fix inclusion.
9+
10+ -- Corey Bryant <corey.bryant@canonical.com> Wed, 14 Jan 2015 10:49:09 -0500
11+
12 nova (1:2015.1~b1-0ubuntu4) vivid; urgency=medium
13
14 * d/nova-objectstore.init.in: Add missing init.in configuration for
15
16=== modified file 'debian/control'
17--- debian/control 2015-01-08 10:10:15 +0000
18+++ debian/control 2015-01-14 16:09:03 +0000
19@@ -7,12 +7,12 @@
20 Build-Depends:
21 debhelper (>= 9~),
22 dh-systemd,
23+ openstack-pkg-tools (>= 21ubuntu5~),
24 python-all (>= 2.6),
25 python-all-dev (>= 2.6.6-3~)
26 Build-Depends-Indep:
27 openssh-client,
28 openssl,
29- openstack-pkg-tools (>= 21~),
30 python-amqplib (>= 0.6.1),
31 python-anyjson (>= 0.3.3),
32 python-babel,

Subscribers

People subscribed via source and target branches