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

Proposed by Corey Bryant
Status: Merged
Merged at revision: 298
Proposed branch: lp://qastaging/~corey.bryant/glance/2014.1.2
Merge into: lp://qastaging/~ubuntu-server-dev/glance/icehouse
Diff against target: 181 lines (+13/-115)
5 files modified
debian/changelog (+11/-0)
debian/patches/fix-requirements.patch (+0/-15)
debian/patches/series (+1/-2)
debian/patches/skip-tests-2.patch (+1/-0)
debian/patches/skip-tests.patch (+0/-98)
To merge this branch: bzr merge lp://qastaging/~corey.bryant/glance/2014.1.2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+230184@code.qastaging.launchpad.net
To post a comment you must log in.
298. By Corey Bryant

* Resynchronize with stable/icehouse (94383db) (LP: #1354159):
  - [5508653] Fix lazy translation UnicodeErrors
  - [94383db] Provide explicit image create value for test_image_paginate case
* d/p/fix-requirements.patch: Refreshed.
* d/p/skip-tests.patch: Dropped.
* d/p/skip-tests-2.patch: Updated description.

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