Launchpad itself

Merge lp://qastaging/~spiv/launchpad/haproxy-for-twisted-services into lp://qastaging/launchpad

haproxy-for-twisted-services
Merge into devel

Proposed by Andrew Bennetts on 2011-02-03

Status:

Merged

Approved by:

Robert Collins on 2011-06-15

Approved revision:

no longer in the source branch.

Merged at revision:

13434

Proposed branch:

lp://qastaging/~spiv/launchpad/haproxy-for-twisted-services

Merge into:

lp://qastaging/launchpad

Diff against target:

37 lines (+5/-2)

2 files modified

lib/lp/services/twistedsupport/gracefulshutdown.py (+1/-0)
lib/lp/services/twistedsupport/tests/test_gracefulshutdown.py (+4/-2)

To merge this branch:

bzr merge lp://qastaging/~spiv/launchpad/haproxy-for-twisted-services

High

Triaged

Link a bug report

Reviewer	Date Requested	Status
Robert Collins (community)		Approve on 2011-06-15
John A Meinel (community)	2011-02-03	Approve on 2011-02-03
Review via email: mp+48427@code.qastaging.launchpad.net

Commit message

[r=jameinel,lifeless][bug=702024] fixes a cosmetic glitch in the text in the new web status page for codehosting SSH: it was always saying "Unavailable"

Description of the change

This fixes a cosmetic glitch in the text in the new web status page for codehosting SSH: it was always saying "Unavailable". The HTTP response code was still correct, though.

Revision history for this message

John A Meinel (jameinel) wrote on 2011-02-03:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2/2/2011 11:15 PM, Andrew Bennetts wrote:
> Andrew Bennetts has proposed merging lp:~spiv/launchpad/haproxy-for-twisted-services into lp:launchpad.
>
> Requested reviews:
> Launchpad code reviewers (launchpad-reviewers)
> Related bugs:
> #702024 Restarting codehosting SSH server drops existing connections
> https://bugs.launchpad.net/bugs/702024
>
> For more details, see:
> https://code.launchpad.net/~spiv/launchpad/haproxy-for-twisted-services/+merge/48427
>
> This fixes a cosmetic glitch in the text in the new web status page for codehosting SSH: it was always saying "Unavailable". The HTTP response code was still correct, though.

Looks good to me. Do you need a more official review?

John
=;->
review: approve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1KzsgACgkQJdeBCYSNAANG/gCgqEPuyq/AKJ/nb7Gtfev7wg1S
BA0AoKX9sr7TzuxH4jYIGigX3lIHs8gU
=iLbn
-----END PGP SIGNATURE-----