OpenStack Heat

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

  1. 2014.2.2
  2. Merge into juno
Proposed by Corey Bryant
Status: Merged
Merged at revision: 81
Proposed branch: lp://qastaging/~corey.bryant/heat/2014.2.2
Merge into: lp://qastaging/~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://qastaging/~corey.bryant/heat/2014.2.2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+248828@code.qastaging.launchpad.net
To post a comment you must log in.
lp://qastaging/~corey.bryant/heat/2014.2.2 updated
81. By Corey Bryant

* 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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches