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

Proposed by Corey Bryant on 2014-08-13
Status: Merged
Merged at revision: 55
Proposed branch: lp:~corey.bryant/heat/2014.1.2
Merge into: lp:~ubuntu-server-dev/heat/icehouse
Diff against target: 22 lines (+15/-0)
1 file modified
debian/changelog (+15/-0)
To merge this branch: bzr merge lp:~corey.bryant/heat/2014.1.2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-08-13 Pending
Review via email: mp+230620@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
=== modified file 'debian/changelog'
--- debian/changelog 2014-06-16 08:27:52 +0000
+++ debian/changelog 2014-08-13 13:30:34 +0000
@@ -1,3 +1,18 @@
1heat (2014.1.2-0ubuntu1) trusty; urgency=medium
2
3 * Resynchronize with stable/icehouse (6facf30) (LP: #1354159):
4 - [48ed483] Stop periodic watcher tasks before deleting stack
5 - [a855f5d] Sync threadgroup module from the oslo stable branch
6 - [bd4ed52] Move novaclient exceptions to heat.tests.v1_1.fakes
7 - [2db68e5] Pass the parent's registry into child stacks
8 - [57f8eaa] Fix String Parameter Receive a unicode
9 - [2aee296] Allow metadata updates to provider resources
10 - [a39ee7c] Do no re-validate parameters for existing stacks
11 - [aa7c030] Do not validate constraints in schema constructor
12 - [6facf30] Ensure routing key is specified in the address for a direct producer
13
14 -- Corey Bryant <corey.bryant@canonical.com> Fri, 08 Aug 2014 08:12:40 -0400
15
1heat (2014.1.1-0ubuntu1) trusty; urgency=medium16heat (2014.1.1-0ubuntu1) trusty; urgency=medium
217
3 * Resynchronize with stable/icehouse (27557c9) (LP: #1328134):18 * Resynchronize with stable/icehouse (27557c9) (LP: #1328134):

Subscribers

People subscribed via source and target branches