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

Proposed by Corey Bryant on 2014-10-06
Status: Merged
Merged at revision: 56
Proposed branch: lp:~corey.bryant/heat/2014.1.3
Merge into: lp:~ubuntu-server-dev/heat/icehouse
Diff against target: 40 lines (+13/-3)
2 files modified
debian/changelog (+10/-0)
debian/patches/fix-requirements.patch (+3/-3)
To merge this branch: bzr merge lp:~corey.bryant/heat/2014.1.3
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-10-06 Pending
Review via email: mp+237272@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-08-14 14:51:28 +0000
3+++ debian/changelog 2014-10-06 13:47:30 +0000
4@@ -1,3 +1,13 @@
5+heat (2014.1.3-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Resynchronize with stable/icehouse (986563e) (LP: #1377136):
8+ - [3cebf6d] Handle NotFoundException when deleting alarm
9+ - [c1c48e2] Support multiple heatclient versions for SD
10+ - [986563e] Set python hash seed to 0 in tox.ini
11+ * d/p/fix-requirements.patch: Rebased.
12+
13+ -- Corey Bryant <corey.bryant@canonical.com> Mon, 06 Oct 2014 09:03:32 -0400
14+
15 heat (2014.1.2-0ubuntu1) trusty; urgency=medium
16
17 [ Corey Bryant ]
18
19=== modified file 'debian/patches/fix-requirements.patch'
20--- debian/patches/fix-requirements.patch 2014-06-13 15:42:30 +0000
21+++ debian/patches/fix-requirements.patch 2014-10-06 13:47:30 +0000
22@@ -3,15 +3,15 @@
23 Forwarded: not needed.
24 Index: heat/requirements.txt
25 ===================================================================
26---- heat.orig/requirements.txt 2014-06-13 10:13:46.164556068 -0400
27-+++ heat/requirements.txt 2014-06-13 11:40:08.456398077 -0400
28+--- a/requirements.txt
29++++ b/requirements.txt
30 @@ -8,7 +8,7 @@
31 argparse
32 lxml>=2.3
33 netaddr>=0.7.6
34 -six>=1.6.0
35 +six>=1.5.2
36- sqlalchemy-migrate>=0.8.2,!=0.8.4
37+ sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2
38 python-novaclient>=2.17.0
39 PasteDeploy>=1.5.0
40 @@ -27,4 +27,3 @@

Subscribers

People subscribed via source and target branches