Launchpad itself

Merge lp:~benji/launchpad/bug-1002820 into lp:launchpad

  1. bug-1002820
  2. Merge into devel
Proposed by Benji York
Status: Merged
Approved by: Gary Poster
Approved revision: no longer in the source branch.
Merged at revision: 15292
Proposed branch: lp:~benji/launchpad/bug-1002820
Merge into: lp:launchpad
Diff against target: 15 lines (+4/-1)
1 file modified
versions.cfg (+4/-1)
To merge this branch: bzr merge lp:~benji/launchpad/bug-1002820
Reviewer Review Type Date Requested Status
Richard Harding (community) code Approve
Review via email: mp+106851@code.launchpad.net

Commit message

Switch our rabbitfixture to a version with longer timeouts. This is a fix/experiment regarding bug 1002820.

Description of the change

This branch switches our rabbitfixture to a version with longer timeouts. This is a fix/experiment regarding bug 1002820.

To post a comment you must log in.
Revision history for this message
Richard Harding (rharding) wrote :

Thanks, looks ok and verified that the package is loaded into the source deps.

review: Approve (code)
Revision history for this message
Gary Poster (gary) wrote :

I have started the landing process with ec2 land, because Benji is unavailable today.

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 2012-05-15 23:01:53 +0000
3+++ versions.cfg 2012-05-22 16:23:50 +0000
4@@ -99,7 +99,10 @@
5 pytz = 2012c
6 rdflib = 3.1.0
7 RestrictedPython = 3.5.1
8-rabbitfixture = 0.3.3
9+# Built from lp:~benji/rabbitfixture/longer-timeout
10+# revision: r30
11+# to build: python setup.py sdist
12+rabbitfixture = 0.3.3-lp-1
13 roman = 1.4.0
14 # See http://code.google.com/p/selenium/issues/detail?id=1935 .
15 selenium = 2.0rc3-lp-distribute-fix