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

[Corey Bryant]

[Martin Pitt (pitti)]

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

Unmerged revisions

3. By Corey Bryant on 2015-01-14

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

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-07 15:17:50 +0000
+++ debian/changelog	2015-01-14 16:10:26 +0000
@@ -1,3 +1,10 @@
+sahara (2015.1~b1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Rebuild to pick up pkgos upstart generation fix.
+    - d/control: Bump openstack-pkg-tools to ensure upstart fix inclusion.
+
+ -- Corey Bryant <[e-mail]>  Wed, 14 Jan 2015 10:51:09 -0500
+
 sahara (2015.1~b1-0ubuntu1) vivid; urgency=medium
 
   * Sync with Debian experimental.
 
=== modified file 'debian/control'
--- debian/control	2015-01-07 15:17:50 +0000
+++ debian/control	2015-01-14 16:10:26 +0000
@@ -8,7 +8,7 @@
            Mehdi Abaakouk <[e-mail]>
 Build-Depends: debhelper (>= 9),
                dh-systemd,
-               openstack-pkg-tools (>= 20~),
+               openstack-pkg-tools (>= 21ubuntu5~),
                python-all (>= 2.6.6-3~),
                python-pbr (>= 0.6),
                python-sphinx (>= 1.2.1)