Launchpad itself

Merge lp:~mwhudson/launchpad/include-twisted-4395-fix into lp:launchpad

  1. include-twisted-4395-fix
  2. Merge into devel
Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: no longer in the source branch.
Merged at revision: 12176
Proposed branch: lp:~mwhudson/launchpad/include-twisted-4395-fix
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
versions.cfg (+1/-1)
To merge this branch: bzr merge lp:~mwhudson/launchpad/include-twisted-4395-fix
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle Approve
Review via email: mp+45483@code.launchpad.net

Commit message

[r=mwhudson][ui=none][bug=556132] Cherry pick in the fix for http://twistedmatrix.com/trac/ticket/4395

Description of the change

Hi,

This branch updates our Twisted dependency to one that has the fix for http://twistedmatrix.com/trac/ticket/4395 applied to it (applied with patch(1) to the current release we're using).

Cheers,
mwh

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Self review

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'versions.cfg'
2--- versions.cfg 2011-01-06 17:02:28 +0000
3+++ versions.cfg 2011-01-07 04:33:05 +0000
4@@ -70,7 +70,7 @@
5 storm = 0.18
6 testtools = 0.9.8-r151
7 transaction = 1.0.0
8-Twisted = 10.1.0
9+Twisted = 10.1.0-4395fix
10 uuid = 1.30
11 van.testing = 2.0.1
12 wadllib = 1.1.5