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

Proposed by Corey Bryant on 2015-02-05
Status: Merged
Merged at revision: 81
Proposed branch: lp:~corey.bryant/heat/2014.2.2
Merge into: lp:~ubuntu-server-dev/heat/juno
Diff against target: 76 lines (+23/-6)
3 files modified
debian/changelog (+17/-0)
debian/control (+2/-2)
debian/patches/fix-requirements.patch (+4/-4)
To merge this branch: bzr merge lp:~corey.bryant/heat/2014.2.2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2015-02-05 Pending
Review via email: mp+248828@code.launchpad.net
To post a comment you must log in.
lp:~corey.bryant/heat/2014.2.2 updated on 2015-02-09
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.

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-12-12 16:56:50 +0000
3+++ debian/changelog 2015-02-09 13:57:50 +0000
4@@ -1,3 +1,20 @@
5+heat (2014.2.2-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Resynchronize with stable/juno (423ee27) (LP: #1418695):
8+ - [b52c916] Convert bool/int values into string for string properties
9+ - [65294f4] Check that template format plugins are registered
10+ - [94dec9e] Disable nested validation for ResourceGroup with zero count
11+ - [c5346cd] Remove mocking of timeutils.utcnow
12+ - [d8abdfd] Always update nested stacks
13+ - [edf0198] ResourceGroup allow update of resource_def
14+ - [aabd3d8] Add Dimensions Default in AWS_CloudWatch_Alarm.yaml
15+ - [bbf7182] Fix error msg invalid stack or res name
16+ - [423ee27] Use kwargs for ResourcePropertyConflict exception
17+ * d/p/fix-requirements.patch: Rebased.
18+ * d/control: Bump minimum python-eventlet to get socket_timeout support.
19+
20+ -- Corey Bryant <corey.bryant@canonical.com> Thu, 05 Feb 2015 15:08:22 -0500
21+
22 heat (2014.2.1-0ubuntu2) utopic; urgency=medium
23
24 * d/control: Add python-oslo.serialization to python-heat depends. Needed for
25
26=== modified file 'debian/control'
27--- debian/control 2014-12-11 22:30:45 +0000
28+++ debian/control 2015-02-09 13:57:50 +0000
29@@ -21,7 +21,7 @@
30 python-cinderclient (>= 1:1.0.7),
31 python-coverage (>= 3.6),
32 python-crypto (>= 2.6),
33- python-eventlet (>= 0.13.0),
34+ python-eventlet (>= 0.13.0-1ubuntu3.1~),
35 python-extras,
36 python-glanceclient (>= 1:0.14.0),
37 python-greenlet (>= 0.3.2),
38@@ -89,7 +89,7 @@
39 python-cinderclient (>= 1:1.0.7),
40 python-coverage (>= 3.6),
41 python-crypto (>= 2.6),
42- python-eventlet (>= 0.13.0),
43+ python-eventlet (>= 0.13.0-1ubuntu3.1~),
44 python-extras,
45 python-glanceclient (>= 1:0.14.0),
46 python-greenlet (>= 0.3.2),
47
48=== modified file 'debian/patches/fix-requirements.patch'
49--- debian/patches/fix-requirements.patch 2014-10-09 15:38:53 +0000
50+++ debian/patches/fix-requirements.patch 2015-02-09 13:57:50 +0000
51@@ -6,12 +6,12 @@
52 pbr>=0.6,!=0.7,<1.0
53 -argparse
54 Babel>=1.3
55--eventlet>=0.15.1
56+-eventlet>=0.15.1,<0.16.0
57 +eventlet>=0.13.0
58 greenlet>=0.3.2
59 httplib2>=0.7.5
60 iso8601>=0.1.9
61-@@ -32,9 +31,8 @@ python-saharaclient>=0.7.3
62+@@ -32,9 +31,8 @@
63 python-swiftclient>=2.2.0
64 python-troveclient>=1.0.4
65 PyYAML>=3.1.0
66@@ -20,8 +20,8 @@
67 -Routes>=1.12.3,!=2.0
68 +Routes>=1.12.3
69 six>=1.7.0
70- SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
71- sqlalchemy-migrate>=0.9.1,!=0.9.2
72+ 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
73+ sqlalchemy-migrate==0.9.1
74 --- a/test-requirements.txt
75 +++ b/test-requirements.txt
76 @@ -3,9 +3,8 @@

Subscribers

People subscribed via source and target branches