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

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-16 08:27:52 +0000
+++ debian/changelog	2014-08-13 13:30:34 +0000
@@ -1,3 +1,18 @@
+heat (2014.1.2-0ubuntu1) trusty; urgency=medium
+
+  * Resynchronize with stable/icehouse (6facf30) (LP: #1354159):
+    - [48ed483] Stop periodic watcher tasks before deleting stack
+    - [a855f5d] Sync threadgroup module from the oslo stable branch
+    - [bd4ed52] Move novaclient exceptions to heat.tests.v1_1.fakes
+    - [2db68e5] Pass the parent's registry into child stacks
+    - [57f8eaa] Fix String Parameter Receive a unicode
+    - [2aee296] Allow metadata updates to provider resources
+    - [a39ee7c] Do no re-validate parameters for existing stacks
+    - [aa7c030] Do not validate constraints in schema constructor
+    - [6facf30] Ensure routing key is specified in the address for a direct producer
+
+ -- Corey Bryant <[e-mail]>  Fri, 08 Aug 2014 08:12:40 -0400
+
 heat (2014.1.1-0ubuntu1) trusty; urgency=medium
 
   * Resynchronize with stable/icehouse (27557c9) (LP: #1328134):