Merge lp:~corey.bryant/heat/2014.1.5 into lp:~ubuntu-server-dev/heat/icehouse

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-30 13:01:45 +0000
+++ debian/changelog	2015-06-22 15:30:07 +0000
@@ -1,3 +1,12 @@
+heat (2014.1.5-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (314437f) (LP: #1467533):
+    - [eb22b01] Fix cloud-init Python syntax for Python < 2.6
+    - [314437f] Patch 033 migration to work w/ MySQL 5.6
+  * d/p/fix-requirements.patch: Rebased
+
+ -- Corey Bryant <[e-mail]>  Mon, 22 Jun 2015 10:14:10 -0400
+
 heat (2014.1.4-0ubuntu2) trusty; urgency=medium
 
   * d/control: Set minimum python-six dependency to 1.5.2 (LP: #1403114).

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2015-03-16 18:33:45 +0000
+++ debian/patches/fix-requirements.patch	2015-06-22 15:30:07 +0000
@@ -5,15 +5,15 @@
 +++ b/requirements.txt
 @@ -8,7 +8,7 @@
  argparse
- lxml>=2.3
- netaddr>=0.7.6
--six>=1.6.0
-+six>=1.5.2
+ lxml>=2.3,<=3.4.2
+ netaddr>=0.7.6,<=0.7.14
+-six>=1.6.0,<=1.9.0
++six>=1.5.2,<=1.9.0
  sqlalchemy-migrate>=0.8.2,!=0.8.4,<=0.9.1
  python-novaclient>=2.17.0,<2.21
- PasteDeploy>=1.5.0
+ PasteDeploy>=1.5.0,<=1.5.2
 @@ -27,4 +27,3 @@
- paramiko>=1.9.0
- Babel>=1.3
+ paramiko>=1.9.0,<=1.15.2
+ Babel>=1.3,<=1.3
  oslo.config>=1.2.0,<1.5
 -qpid-python