Merge lp:~corey.bryant/heat/2015.1.1 into lp:~ubuntu-server-dev/heat/kilo

Proposed by Corey Bryant on 2015-08-03
Status: Merged
Merged at revision: 103
Proposed branch: lp:~corey.bryant/heat/2015.1.1
Merge into: lp:~ubuntu-server-dev/heat/kilo
Diff against target: 70 lines (+44/-9)
2 files modified
debian/changelog (+36/-0)
debian/patches/fix-requirements.patch (+8/-9)
To merge this branch: bzr merge lp:~corey.bryant/heat/2015.1.1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2015-08-03 Pending
Review via email: mp+266788@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 2015-05-26 10:56:16 +0000
3+++ debian/changelog 2015-08-03 19:27:47 +0000
4@@ -1,3 +1,39 @@
5+heat (2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Resynchronize with stable/kilo (536dc83) (LP: #1481008):
8+ - [9ca4a53] Use action in check_*_complete method
9+ - [ed52c86] Produce more meaningful exception messages in nested stacks
10+ - [e35450a] Fix failures related to the mock 1.1.0 release
11+ - [ac5e71f] test_resource for functional tests
12+ - [c0d1b91] Improve StackValidationFailed response in properties
13+ - [99f95f0] Count all nested stack resources with DB operations
14+ - [5703a2f] Add domain when list users in heat-keystone-setup-domain
15+ - [18742d1] Heat could not create samples with Ceilometer
16+ - [a55f827] Missing template file on update fails silently
17+ - [1b5ff07] Failed to import test module in test
18+ - [b0be013] Add env storing for loaded environments
19+ - [a3bc0f6] Fix heat-db-setup error on rhel7.1
20+ - [3a7e7cb] Find root stack ID with database operations
21+ - [38b47eb] Continue to check if nova task is in progress
22+ - [8919a34] Catch exceptions in service status report
23+ - [754851d] Fix block_device_mapping property validation when using get_attr
24+ - [28a0639] Do not verify requirements on extension loading
25+ - [7148a96] Backup new resource as soon as possible
26+ - [da37773] Save updated-in-place resources to backup stack
27+ - [be9af28] Report status when engine start
28+ - [d2e70e4] Use snapshot's environment when stack restore
29+ - [612d806] Fix integration tests for tox>2.0
30+ - [ed2bed2] Fix property validation for TemplateResource during update
31+ - [a5297fe] Get rid of circular references in Resource and Function
32+ - [c7b1524] Sync oslo incubator
33+ - [06a5c0e] Generate stack events for stack state transitions
34+ - [aa4b90d] Update template paths for environment-mapped TemplateResources
35+ - [2a6378c] Fix TypeError exception during cancel stack update
36+ - [536dc83] Use SHA256 instead of SHA1 for resource signature
37+ * d/p/fix-requirements.patch: Rebased.
38+
39+ -- Corey Bryant <corey.bryant@canonical.com> Mon, 03 Aug 2015 14:29:26 -0400
40+
41 heat (2015.1.0-0ubuntu1.1) vivid; urgency=medium
42
43 * debian/heat-common.install: install missing scripts (LP: #1453160):
44
45=== modified file 'debian/patches/fix-requirements.patch'
46--- debian/patches/fix-requirements.patch 2015-04-30 13:58:35 +0000
47+++ debian/patches/fix-requirements.patch 2015-08-03 19:27:47 +0000
48@@ -1,14 +1,13 @@
49-diff -Naurp heat-2015.1.0.orig/requirements.txt heat-2015.1.0/requirements.txt
50---- heat-2015.1.0.orig/requirements.txt 2015-04-30 14:01:47.000000000 +0200
51-+++ heat-2015.1.0/requirements.txt 2015-04-30 14:44:43.546753986 +0200
52-@@ -38,9 +38,8 @@ python-saharaclient>=0.8.0,<0.9.0
53- python-swiftclient>=2.2.0,<2.5.0
54- python-troveclient>=1.0.7,<1.1.0
55+--- a/requirements.txt
56++++ b/requirements.txt
57+@@ -38,9 +38,8 @@
58+ python-swiftclient<2.5.0,>=2.2.0
59+ python-troveclient<1.1.0,>=1.0.7
60 PyYAML>=3.1.0
61 -qpid-python
62- requests>=2.2.0,!=2.4.0
63--Routes>=1.12.3,!=2.0
64+ requests!=2.4.0,>=2.2.0
65+-Routes!=2.0,>=1.12.3
66 +Routes>=1.12.3
67 six>=1.9.0
68- SQLAlchemy>=0.9.7,<=0.9.99
69+ SQLAlchemy<=0.9.99,>=0.9.7
70 sqlalchemy-migrate>=0.9.5

Subscribers

People subscribed via source and target branches