Merge lp://qastaging/~hopem/nova/icehouse-lp1506257 into lp://qastaging/~ubuntu-server-dev/nova/icehouse

Proposed by Edward Hope-Morley
Status: Approved
Approved by: Corey Bryant
Approved revision: 707
Proposed branch: lp://qastaging/~hopem/nova/icehouse-lp1506257
Merge into: lp://qastaging/~ubuntu-server-dev/nova/icehouse
Diff against target: 74 lines (+54/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/protect-against-upgrade-rpc-ver-mismatch.patch (+46/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp://qastaging/~hopem/nova/icehouse-lp1506257
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+274493@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Corey Bryant (corey.bryant) wrote :

Thanks Ed. I merged the diff from launchpad instead since the changelog signature had a different time stamp. https://launchpadlibrarian.net/222055256/nova_1%3A2014.1.5-0ubuntu1.3_1%3A2014.1.5-0ubuntu1.4.diff.gz

Unmerged revisions

707. By Edward Hope-Morley

* Protect against possible rpcapi mismatch on upgrade (LP: #1506257)
  - d/p/protect-against-upgrade-rpc-ver-mismatch.patch

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