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

[Corey Bryant]

[lp:~corey.bryant/heat/2014.1.4]

57. By Corey Bryant on 2015-03-16

* Resynchronize with stable/icehouse (2b4f7be) (LP: #1432608):
  - [678ea13] Use empty list in list_join for validation
  - [0b984b8] Call server volume detach only once
  - [5a34e4f] Use environment file in template-validate
  - [60cbd5b] Catch NotFound error during loadbalancer deleting
  - [006b959] Prevent excessive validation for maxPersonality limit
  - [2b4f7be] Only delete stack user project from correct domain
* d/p/fix-requirements.patch: Rebased

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-06 13:55:37 +0000
+++ debian/changelog	2015-03-16 19:14:44 +0000
@@ -1,3 +1,16 @@
+heat (2014.1.4-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (2b4f7be) (LP: #1432608):
+    - [678ea13] Use empty list in list_join for validation
+    - [0b984b8] Call server volume detach only once
+    - [5a34e4f] Use environment file in template-validate
+    - [60cbd5b] Catch NotFound error during loadbalancer deleting
+    - [006b959] Prevent excessive validation for maxPersonality limit
+    - [2b4f7be] Only delete stack user project from correct domain
+  * d/p/fix-requirements.patch: Rebased
+
+ -- Corey Bryant <[e-mail]>  Mon, 16 Mar 2015 14:19:59 -0400
+
 heat (2014.1.3-0ubuntu1) trusty; urgency=medium
 
   [ Corey Bryant ]
 
=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-10-06 13:14:04 +0000
+++ debian/patches/fix-requirements.patch	2015-03-16 19:14:44 +0000
@@ -1,8 +1,6 @@
 Description: Don't install python-qpid, and set min version of six.
 Author: Corey Bryant <[e-mail]>
 Forwarded: not needed.
-Index: heat/requirements.txt
-===================================================================
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -8,7 +8,7 @@
@@ -11,11 +9,11 @@
  netaddr>=0.7.6
 -six>=1.6.0
 +six>=1.5.2
- sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2
- python-novaclient>=2.17.0
+ sqlalchemy-migrate>=0.8.2,!=0.8.4,<=0.9.1
+ python-novaclient>=2.17.0,<2.21
  PasteDeploy>=1.5.0
 @@ -27,4 +27,3 @@
  paramiko>=1.9.0
  Babel>=1.3
- oslo.config>=1.2.0
+ oslo.config>=1.2.0,<1.5
 -qpid-python