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

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-14 14:51:28 +0000
+++ debian/changelog	2014-10-06 13:47:30 +0000
@@ -1,3 +1,13 @@
+heat (2014.1.3-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (986563e) (LP: #1377136):
+    - [3cebf6d] Handle NotFoundException when deleting alarm
+    - [c1c48e2] Support multiple heatclient versions for SD
+    - [986563e] Set python hash seed to 0 in tox.ini
+  * d/p/fix-requirements.patch: Rebased.
+
+ -- Corey Bryant <[e-mail]>  Mon, 06 Oct 2014 09:03:32 -0400
+
 heat (2014.1.2-0ubuntu1) trusty; urgency=medium
 
   [ Corey Bryant ]
 
=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-06-13 15:42:30 +0000
+++ debian/patches/fix-requirements.patch	2014-10-06 13:47:30 +0000
@@ -3,15 +3,15 @@
 Forwarded: not needed.
 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
+--- a/requirements.txt
++++ b/requirements.txt
 @@ -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
+ sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2
  python-novaclient>=2.17.0
  PasteDeploy>=1.5.0
 @@ -27,4 +27,3 @@