OpenStack Heat

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

  1. 2015.1-b1-0ubuntu4
  2. Merge into kilo
Proposed by Corey Bryant
Status: Merged
Merged at revision: 87
Proposed branch: lp:~corey.bryant/heat/2015.1-b1-0ubuntu4
Merge into: lp:~ubuntu-server-dev/heat/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/heat/2015.1-b1-0ubuntu4
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+246451@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 17:57:56 +0000
3+++ debian/changelog 2015-01-14 16:06:14 +0000
4@@ -1,3 +1,10 @@
5+heat (2015.1~b1-0ubuntu4) 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:44:06 -0500
11+
12 heat (2015.1~b1-0ubuntu3) vivid; urgency=medium
13
14 [ Corey Bryant ]
15
16=== modified file 'debian/control'
17--- debian/control 2015-01-09 16:46:07 +0000
18+++ debian/control 2015-01-14 16:06:14 +0000
19@@ -12,7 +12,7 @@
20 Build-Depends:
21 debhelper (>= 9~),
22 dh-systemd,
23- openstack-pkg-tools (>= 21~),
24+ openstack-pkg-tools (>= 21ubuntu5~),
25 python-all (>= 2.6.6-3~),
26 python-pbr (>= 0.6),
27 Build-Depends-Indep:

Subscribers

People subscribed via source and target branches