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

Proposed by Corey Bryant
Status: Merged
Merged at revision: 43
Proposed branch: lp:~corey.bryant/trove/2015.1-b1-0ubuntu3
Merge into: lp:~ubuntu-server-dev/trove/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/trove/2015.1-b1-0ubuntu3
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+246458@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 09:51:19 +0000
+++ debian/changelog 2015-01-14 16:11:01 +0000
@@ -1,3 +1,10 @@
1openstack-trove (2015.1~b1-0ubuntu3) 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:52:23 -0500
7
1openstack-trove (2015.1~b1-0ubuntu2) vivid; urgency=medium8openstack-trove (2015.1~b1-0ubuntu2) vivid; urgency=medium
29
3 * Systemd enablement:10 * Systemd enablement:
411
=== modified file 'debian/control'
--- debian/control 2015-01-09 20:32:45 +0000
+++ debian/control 2015-01-14 16:11:01 +0000
@@ -9,7 +9,7 @@
9Build-Depends: debhelper (>= 9~),9Build-Depends: debhelper (>= 9~),
10 dh-systemd,10 dh-systemd,
11 dh-exec,11 dh-exec,
12 openstack-pkg-tools (>= 21~),12 openstack-pkg-tools (>= 21ubuntu5~),
13 python-all (>= 2.6.6-3~),13 python-all (>= 2.6.6-3~),
14 python-pbr (>= 0.6),14 python-pbr (>= 0.6),
15 python-setuptools15 python-setuptools

Subscribers

People subscribed via source and target branches