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

[Corey Bryant]

Ubuntu Stable Release Update for OpenStack Icehouse

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

54. By Corey Bryant on 2014-06-13

* Resynchronize with stable/icehouse (27557c9) (LP: #1328134):
  - [368b6d3] Avoid redundant polling of DB for metadata
  - [0f92683] Fix failed to delete the NovaFloatingIPAssociation resource
  - [930cb3c] Fix status reason in events for deployment signals
  - [4b9ff4f] Truncate status_reason to column length
  - [3c560c6] Catch NotFound for keystone delete operations
  - [e63baf6] Using correct attribute of exception
  - [08154b0] Allow NotFound to be created without args
  - [857ca78] Updated from global requirements
  - [03dd894] Don't dynamically create provider types in the global env
  - [937ac5a] Ignore nova limits set to '-1'
  - [27557c9] Don't pass enable_snat by default in Router

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-17 11:27:45 +0000
+++ debian/changelog	2014-06-13 16:39:54 +0000
@@ -1,3 +1,20 @@
+heat (2014.1.1-0ubuntu1) trusty; urgency=medium
+
+  * Resynchronize with stable/icehouse (27557c9) (LP: #1328134):
+    - [368b6d3] Avoid redundant polling of DB for metadata
+    - [0f92683] Fix failed to delete the NovaFloatingIPAssociation resource
+    - [930cb3c] Fix status reason in events for deployment signals
+    - [4b9ff4f] Truncate status_reason to column length
+    - [3c560c6] Catch NotFound for keystone delete operations
+    - [e63baf6] Using correct attribute of exception
+    - [08154b0] Allow NotFound to be created without args
+    - [857ca78] Updated from global requirements
+    - [03dd894] Don't dynamically create provider types in the global env
+    - [937ac5a] Ignore nova limits set to '-1'
+    - [27557c9] Don't pass enable_snat by default in Router
+
+ -- Corey Bryant <[e-mail]>  Mon, 09 Jun 2014 15:09:49 -0400
+
 heat (2014.1-0ubuntu1) trusty; urgency=medium
 
   [ Chuck Short ]
 
=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-04-10 13:31:46 +0000
+++ debian/patches/fix-requirements.patch	2014-06-13 16:39:54 +0000
@@ -1,10 +1,20 @@
-Description: Dont install python-qpid
-Author: Chuck Short <[e-mail]>
+Description: Don't install python-qpid, and set min version of six.
+Author: Corey Bryant <[e-mail]>
 Forwarded: not needed.
-diff -Naurp heat-2014.1.rc2.orig/requirements.txt heat-2014.1.rc2/requirements.txt
---- heat-2014.1.rc2.orig/requirements.txt	2014-04-10 03:27:34.000000000 -0400
-+++ heat-2014.1.rc2/requirements.txt	2014-04-10 09:20:22.477931898 -0400
-@@ -27,4 +27,3 @@ PyYAML>=3.1.0
+Index: heat/requirements.txt
+===================================================================
+--- heat.orig/requirements.txt	2014-06-13 10:13:46.164556068 -0400
++++ heat/requirements.txt	2014-06-13 11:40:08.456398077 -0400
+@@ -8,7 +8,7 @@
+ argparse
+ lxml>=2.3
+ netaddr>=0.7.6
+-six>=1.6.0
++six>=1.5.2
+ sqlalchemy-migrate>=0.8.2,!=0.8.4
+ python-novaclient>=2.17.0
+ PasteDeploy>=1.5.0
+@@ -27,4 +27,3 @@
  paramiko>=1.9.0
  Babel>=1.3
  oslo.config>=1.2.0