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

Proposed by Corey Bryant on 2014-06-09
Status: Merged
Merged at revision: 54
Proposed branch: lp:~corey.bryant/heat/2014.1.1
Merge into: lp:~ubuntu-server-dev/heat/icehouse
Diff against target: 55 lines (+33/-6)
2 files modified
debian/changelog (+17/-0)
debian/patches/fix-requirements.patch (+16/-6)
To merge this branch: bzr merge lp:~corey.bryant/heat/2014.1.1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-06-09 Pending
Review via email: mp+222551@code.launchpad.net

Description of the change

Ubuntu Stable Release Update for OpenStack Icehouse

To post a comment you must log in.
lp:~corey.bryant/heat/2014.1.1 updated on 2014-06-13
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

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

Subscribers

People subscribed via source and target branches