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

Proposed by Corey Bryant
Status: Merged
Merged at revision: 25
Proposed branch: lp:~corey.bryant/ironic/2015.1-b1-0ubuntu4
Merge into: lp:~ubuntu-server-dev/ironic/kilo
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~corey.bryant/ironic/2015.1-b1-0ubuntu4
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+246452@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-01-12 16:05:45 +0000
+++ debian/changelog 2015-01-14 16:07:00 +0000
@@ -1,3 +1,10 @@
1ironic (2015.1~b1-0ubuntu4) UNRELEASED; urgency=medium
2
3 * Rebuild to pick up pkgos upstart generation fix.
4 - d/control: Bump openstack-pkg-tools to ensure upstart fix inclusion.
5
6 -- Corey Bryant <corey.bryant@canonical.com> Wed, 14 Jan 2015 10:45:55 -0500
7
1ironic (2015.1~b1-0ubuntu3) vivid; urgency=medium8ironic (2015.1~b1-0ubuntu3) vivid; urgency=medium
29
3 * No change rebuild to fixup detection of pysendfile dependency. 10 * No change rebuild to fixup detection of pysendfile dependency.
411
=== modified file 'debian/control'
--- debian/control 2015-01-12 09:40:29 +0000
+++ debian/control 2015-01-14 16:07:00 +0000
@@ -6,7 +6,7 @@
6 alembic (>= 0.7.1),6 alembic (>= 0.7.1),
7 debhelper (>= 9~),7 debhelper (>= 9~),
8 dh-systemd,8 dh-systemd,
9 openstack-pkg-tools (>= 21~),9 openstack-pkg-tools (>= 21ubuntu5~),
10 python-all (>= 2.6),10 python-all (>= 2.6),
11 python-amqplib (>= 0.3.3),11 python-amqplib (>= 0.3.3),
12 python-anyjson (>=0.3.3),12 python-anyjson (>=0.3.3),

Subscribers

People subscribed via source and target branches