Merge lp:~corey.bryant/heat/kilo-3 into lp:~ubuntu-server-dev/heat/kilo

[Corey Bryant]

[lp:~corey.bryant/heat/kilo-3]

93. By Corey Bryant on 2015-03-20

* New upstream release.
  - d/control: Align with upstream dependencies.
  - d/p/sudoers_patch.patch: Rebased.
  - d/p/fix-requirements.patch: Rebased.

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-19 14:27:59 +0000
+++ debian/changelog	2015-03-20 18:50:02 +0000
@@ -1,3 +1,12 @@
+heat (2015.1~b3-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - d/control: Align with upstream dependencies.
+    - d/p/sudoers_patch.patch: Rebased.
+    - d/p/fix-requirements.patch: Rebased.
+
+ -- Corey Bryant <[e-mail]>  Fri, 20 Mar 2015 14:41:28 -0400
+
 heat (2015.1~b2-0ubuntu3) vivid; urgency=medium
 
   * d/pydist-overrides: Add overrides for oslo packages.

=== modified file 'debian/control'
--- debian/control	2015-03-19 14:27:59 +0000
+++ debian/control	2015-03-20 18:50:02 +0000
@@ -28,30 +28,32 @@
  python-glanceclient (>= 1:0.15.0),
  python-greenlet (>= 0.3.2),
  python-hacking (>= 0.9.4),
- python-heatclient (>= 0.2.9),
+ python-heatclient (>= 0.3.0),
  python-httplib2 (>= 0.7.5),
  python-iso8601 (>= 0.1.9),
- python-keystoneclient (>= 1:1.0.0),
+ python-keystoneclient (>= 1:1.1.0),
  python-keystonemiddleware (>= 1.0.0),
  python-kombu (>=2.5.0),
  python-lockfile (>= 0.8),
  python-lxml (>= 2.3),
  python-memcache,
- python-migrate (>= 0.9.1),
+ python-migrate (>= 0.9.5),
  python-mock (>= 1.0),
  python-mox (>= 0.5.3),
  python-mysqldb,
  python-netaddr (>= 0.7.12),
- python-neutronclient (>= 1:2.3.6),
+ python-neutronclient (>= 1:2.3.11),
  python-novaclient (>= 1:2.18.0),
- python-oslo-config (>= 1:1.6.0),
- python-oslo-context (>= 0.1.0),
- python-oslo-db (>= 1.4.1),
+ python-oslo-config (>= 1:1.9.0),
+ python-oslo-context (>= 0.2.0),
+ python-oslo-db (>= 1.5.0),
  python-oslo-i18n (>= 1.3.0),
- python-oslo-messaging (>= 1.4.0),
+ python-oslo-log (>= 0.4.0),
+ python-oslo-messaging (>= 1.6.0),
  python-oslo-middleware (>= 0.3.0),
  python-oslo-serialization (>= 1.2.0),
  python-oslo-utils (>= 1.2.0),
+ python-oslo-versionedobjects (>= 0.1.0),
  python-oslosphinx (>= 2.2.0),
  python-oslotest (>= 1:1.2.0),
  python-osprofiler (>= 0.3.0),
@@ -64,7 +66,7 @@
  python-routes (>= 1.12.3),
  python-saharaclient (>= 0.7.6),
  python-setuptools,
- python-six (>= 1.7.0),
+ python-six (>= 1.9.0),
  python-sphinx (>= 1.1.2),
  python-sqlalchemy (>= 0.9.7),
  python-stevedore (>= 1.1.0),
@@ -100,28 +102,30 @@
  python-glanceclient (>= 1:0.15.0),
  python-greenlet (>= 0.3.2),
  python-hacking (>= 0.9.4),
- python-heatclient (>= 0.2.9),
+ python-heatclient (>= 0.3.0),
  python-httplib2 (>= 0.7.5),
  python-iso8601 (>= 0.1.9),
- python-keystoneclient (>= 1:1.0.0),
+ python-keystoneclient (>= 1:1.1.0),
  python-keystonemiddleware (>= 1.0.0),
  python-kombu (>=2.5.0),
  python-lockfile (>= 0.8),
  python-lxml (>= 2.3),
  python-memcache,
- python-migrate (>= 0.9.1),
+ python-migrate (>= 0.9.5),
  python-mysqldb,
  python-netaddr (>= 0.7.12),
- python-neutronclient (>= 1:2.3.6),
+ python-neutronclient (>= 1:2.3.11),
  python-novaclient (>= 1:2.18.0),
- python-oslo-config (>= 1:1.6.0),
- python-oslo-context (>= 0.1.0),
- python-oslo-db (>= 1.4.1),
+ python-oslo-config (>= 1:1.9.0),
+ python-oslo-context (>= 0.2.0),
+ python-oslo-db (>= 1.5.0),
  python-oslo-i18n (>= 1.3.0),
- python-oslo-messaging (>= 1.4.0),
+ python-oslo-log (>= 0.4.0),
+ python-oslo-messaging (>= 1.6.0),
  python-oslo-middleware (>= 0.3.0),
  python-oslo-serialization (>= 1.2.0),
  python-oslo-utils (>= 1.2.0),
+ python-oslo-versionedobjects (>= 0.1.0),
  python-oslosphinx (>= 2.2.0),
  python-osprofiler (>= 0.3.0),
  python-paste,
@@ -133,7 +137,7 @@
  python-routes (>= 1.12.3),
  python-saharaclient (>= 0.7.6),
  python-setuptools,
- python-six (>= 1.7.0),
+ python-six (>= 1.9.0),
  python-sphinx (>= 1.1.2),
  python-sqlalchemy (>= 0.9.7),
  python-stevedore (>= 1.1.0),

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2015-01-05 20:56:10 +0000
+++ debian/patches/fix-requirements.patch	2015-03-20 18:50:02 +0000
@@ -1,6 +1,6 @@
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -35,11 +35,10 @@
+@@ -37,9 +37,8 @@
  python-swiftclient>=2.2.0
  python-troveclient>=1.0.7
  PyYAML>=3.1.0
@@ -8,9 +8,6 @@
  requests>=2.2.0,!=2.4.0
 -Routes>=1.12.3,!=2.0
 +Routes>=1.12.3
- six>=1.7.0
+ six>=1.9.0
  SQLAlchemy>=0.9.7,<=0.9.99
--sqlalchemy-migrate>=0.9.1,!=0.9.2
-+sqlalchemy-migrate>=0.9.1
- stevedore>=1.1.0  # Apache-2.0
- WebOb>=1.2.3
+ sqlalchemy-migrate>=0.9.5

=== modified file 'debian/patches/sudoers_patch.patch'
--- debian/patches/sudoers_patch.patch	2014-10-09 15:38:53 +0000
+++ debian/patches/sudoers_patch.patch	2015-03-20 18:50:02 +0000
@@ -1,9 +1,9 @@
 Description: Change sudoers directory to be sudoers.d
 Author: Chuck Short <[e-mail]>
 Forwarded: Not needed.
---- a/heat/engine/resources/nova_utils.py
-+++ b/heat/engine/resources/nova_utils.py
-@@ -170,8 +170,8 @@ def build_userdata(resource, userdata=No
+--- a/heat/engine/nova_utils.py
++++ b/heat/engine/nova_utils.py
+@@ -171,8 +171,8 @@
          #
          # See bug https://bugs.launchpad.net/heat/+bug/1257410
          boothook_custom_user = r"""useradd -m %s