Sahara

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

  1. 2015.1-b1-0ubuntu2
  2. Merge into kilo
Proposed by Corey Bryant
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp:~corey.bryant/sahara/2015.1-b1-0ubuntu2
Merge into: lp:~ubuntu-server-dev/sahara/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/sahara/2015.1-b1-0ubuntu2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+246457@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Wily source b-deps on openstack-pkg-tools (>= 23~) so this is obsolete.

Unmerged revisions

3. By Corey Bryant

* Rebuild to pick up pkgos upstart generation fix.
  - d/control: Bump openstack-pkg-tools to ensure upstart fix inclusion.

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-07 15:17:50 +0000
3+++ debian/changelog 2015-01-14 16:10:26 +0000
4@@ -1,3 +1,10 @@
5+sahara (2015.1~b1-0ubuntu2) 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:51:09 -0500
11+
12 sahara (2015.1~b1-0ubuntu1) vivid; urgency=medium
13
14 * Sync with Debian experimental.
15
16=== modified file 'debian/control'
17--- debian/control 2015-01-07 15:17:50 +0000
18+++ debian/control 2015-01-14 16:10:26 +0000
19@@ -8,7 +8,7 @@
20 Mehdi Abaakouk <sileht@sileht.net>
21 Build-Depends: debhelper (>= 9),
22 dh-systemd,
23- openstack-pkg-tools (>= 20~),
24+ openstack-pkg-tools (>= 21ubuntu5~),
25 python-all (>= 2.6.6-3~),
26 python-pbr (>= 0.6),
27 python-sphinx (>= 1.2.1)

Subscribers

People subscribed via source and target branches