Merge lp:~corey.bryant/heat/2014.2.2 into lp:~ubuntu-server-dev/heat/juno

[Corey Bryant]

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

81. By Corey Bryant on 2015-02-09

* Resynchronize with stable/juno (423ee27) (LP: #1418695):
  - [b52c916] Convert bool/int values into string for string properties
  - [65294f4] Check that template format plugins are registered
  - [94dec9e] Disable nested validation for ResourceGroup with zero count
  - [c5346cd] Remove mocking of timeutils.utcnow
  - [d8abdfd] Always update nested stacks
  - [edf0198] ResourceGroup allow update of resource_def
  - [aabd3d8] Add Dimensions Default in AWS_CloudWatch_Alarm.yaml
  - [bbf7182] Fix error msg invalid stack or res name
  - [423ee27] Use kwargs for ResourcePropertyConflict exception
* d/p/fix-requirements.patch: Rebased.
* d/control: Bump minimum python-eventlet to get socket_timeout support.

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-12 16:56:50 +0000
+++ debian/changelog	2015-02-09 13:57:50 +0000
@@ -1,3 +1,20 @@
+heat (2014.2.2-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/juno (423ee27) (LP: #1418695):
+    - [b52c916] Convert bool/int values into string for string properties
+    - [65294f4] Check that template format plugins are registered
+    - [94dec9e] Disable nested validation for ResourceGroup with zero count
+    - [c5346cd] Remove mocking of timeutils.utcnow
+    - [d8abdfd] Always update nested stacks
+    - [edf0198] ResourceGroup allow update of resource_def
+    - [aabd3d8] Add Dimensions Default in AWS_CloudWatch_Alarm.yaml
+    - [bbf7182] Fix error msg invalid stack or res name
+    - [423ee27] Use kwargs for ResourcePropertyConflict exception
+  * d/p/fix-requirements.patch: Rebased.
+  * d/control: Bump minimum python-eventlet to get socket_timeout support.
+
+ -- Corey Bryant <[e-mail]>  Thu, 05 Feb 2015 15:08:22 -0500
+
 heat (2014.2.1-0ubuntu2) utopic; urgency=medium
 
   * d/control: Add python-oslo.serialization to python-heat depends. Needed for

=== modified file 'debian/control'
--- debian/control	2014-12-11 22:30:45 +0000
+++ debian/control	2015-02-09 13:57:50 +0000
@@ -21,7 +21,7 @@
  python-cinderclient (>= 1:1.0.7),
  python-coverage (>= 3.6),
  python-crypto (>= 2.6),
- python-eventlet (>= 0.13.0),
+ python-eventlet (>= 0.13.0-1ubuntu3.1~),
  python-extras,
  python-glanceclient (>= 1:0.14.0),
  python-greenlet (>= 0.3.2),
@@ -89,7 +89,7 @@
  python-cinderclient (>= 1:1.0.7),
  python-coverage (>= 3.6),
  python-crypto (>= 2.6),
- python-eventlet (>= 0.13.0),
+ python-eventlet (>= 0.13.0-1ubuntu3.1~),
  python-extras,
  python-glanceclient (>= 1:0.14.0),
  python-greenlet (>= 0.3.2),

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-10-09 15:38:53 +0000
+++ debian/patches/fix-requirements.patch	2015-02-09 13:57:50 +0000
@@ -6,12 +6,12 @@
  pbr>=0.6,!=0.7,<1.0
 -argparse
  Babel>=1.3
--eventlet>=0.15.1
+-eventlet>=0.15.1,<0.16.0
 +eventlet>=0.13.0
  greenlet>=0.3.2
  httplib2>=0.7.5
  iso8601>=0.1.9
-@@ -32,9 +31,8 @@ python-saharaclient>=0.7.3
+@@ -32,9 +31,8 @@
  python-swiftclient>=2.2.0
  python-troveclient>=1.0.4
  PyYAML>=3.1.0
@@ -20,8 +20,8 @@
 -Routes>=1.12.3,!=2.0
 +Routes>=1.12.3
  six>=1.7.0
- SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
- sqlalchemy-migrate>=0.9.1,!=0.9.2
+ SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
+ sqlalchemy-migrate==0.9.1
 --- a/test-requirements.txt
 +++ b/test-requirements.txt
 @@ -3,9 +3,8 @@