Merge lp://staging/~gary/launchpad/bug627442 into lp://staging/launchpad
Proposed by
Gary Poster
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Robert Collins | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 11515 | ||||
| Proposed branch: | lp://staging/~gary/launchpad/bug627442 | ||||
| Merge into: | lp://staging/launchpad | ||||
| Diff against target: |
58 lines (+4/-22) 2 files modified
lib/canonical/launchpad/webapp/batching.py (+0/-21) versions.cfg (+4/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~gary/launchpad/bug627442 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Graham Binns (community) | release-critical | Approve | |
| Robert Collins (community) | Approve | ||
|
Review via email:
|
|||
Commit message
fix bug 620506 by cherrypicking the storm fix for bug 627442.
Description of the change
This branch fixes bug 620506 and bug 627442. These are both caused by underlying bugs in Storm. I brought the pertinent fix back to 0.17, so the new, custom storm release is 0.17 with only the cherrypick of the pertinent fix. The Storm branch includes a test, which passes, and which I am considering to be the test for this branch.
I was able to remove a previous hack around the problem because of this change. Previous tests added at that time continue to pass.
Local QA: https:/
Lint is happy.
This is a release-critical candidate.
To post a comment you must log in.
Revision history for this message
| Robert Collins (lifeless) wrote | # |
Revision history for this message
| Graham Binns (gmb) | # |
review:
Approve
(release-critical)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1