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

Proposed by Corey Bryant
Status: Merged
Merged at revision: 57
Proposed branch: lp://qastaging/~corey.bryant/heat/2014.1.4
Merge into: lp://qastaging/~ubuntu-server-dev/heat/icehouse
Diff against target: 48 lines (+16/-5)
2 files modified
debian/changelog (+13/-0)
debian/patches/fix-requirements.patch (+3/-5)
To merge this branch: bzr merge lp://qastaging/~corey.bryant/heat/2014.1.4
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+253095@code.qastaging.launchpad.net
To post a comment you must log in.
57. By Corey Bryant

* Resynchronize with stable/icehouse (2b4f7be) (LP: #1432608):
  - [678ea13] Use empty list in list_join for validation
  - [0b984b8] Call server volume detach only once
  - [5a34e4f] Use environment file in template-validate
  - [60cbd5b] Catch NotFound error during loadbalancer deleting
  - [006b959] Prevent excessive validation for maxPersonality limit
  - [2b4f7be] Only delete stack user project from correct domain
* d/p/fix-requirements.patch: Rebased

Revision history for this message
James Page (james-page) :
review: Approve

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