Launchpad itself

Merge lp:~jml/launchpad/twisted-10.2 into lp:launchpad

  1. twisted-10.2
  2. Merge into devel
Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merged at revision: 12193
Proposed branch: lp:~jml/launchpad/twisted-10.2
Merge into: lp:launchpad
Diff against target: 29 lines (+7/-1)
2 files modified
lib/lp/codehosting/puller/scheduler.py (+6/-0)
versions.cfg (+1/-1)
To merge this branch: bzr merge lp:~jml/launchpad/twisted-10.2
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+46005@code.launchpad.net

Commit message

[r=jml][ui=none][no-qa] Upgrade the version of Twisted that Launchpad uses from 10.1 to 10.2, preserving the patch for Twisted bug 4395.

Description of the change

This branch upgrades the version of Twisted that Launchpad is using from 10.1 to 10.2. It preserves the manually applied patch to fix http://twistedmatrix.com/trac/ticket/4395. It does not clean up any work-arounds that are no longer necessary.

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Trivial change.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/codehosting/puller/scheduler.py'
2--- lib/lp/codehosting/puller/scheduler.py 2010-08-24 10:45:57 +0000
3+++ lib/lp/codehosting/puller/scheduler.py 2011-01-13 01:11:18 +0000
4@@ -233,6 +233,12 @@
5 else:
6 return reason
7
8+ def makeConnection(self, process):
9+ """Called when the process has been created."""
10+ ProcessMonitorProtocolWithTimeout.makeConnection(self, process)
11+ NetstringReceiver.makeConnection(self, process)
12+ self.wire_protocol.makeConnection(process)
13+
14 def outReceived(self, data):
15 self.wire_protocol.dataReceived(data)
16
17
18=== modified file 'versions.cfg'
19--- versions.cfg 2011-01-12 00:35:29 +0000
20+++ versions.cfg 2011-01-13 01:11:18 +0000
21@@ -70,7 +70,7 @@
22 storm = 0.18
23 testtools = 0.9.8
24 transaction = 1.0.0
25-Twisted = 10.1.0-4395fix
26+Twisted = 10.2.0-4395fix-1
27 uuid = 1.30
28 van.testing = 2.0.1
29 wadllib = 1.1.5