Merge lp:~michael.nelson/rnr-server/update-sso-client into lp:rnr-server

Proposed by Michael Nelson
Status: Merged
Approved by: Michael Nelson
Approved revision: 306
Merged at revision: 306
Proposed branch: lp:~michael.nelson/rnr-server/update-sso-client
Merge into: lp:rnr-server
Diff against target: 12 lines (+1/-1)
1 file modified
config-manager.txt (+1/-1)
To merge this branch: bzr merge lp:~michael.nelson/rnr-server/update-sso-client
Reviewer Review Type Date Requested Status
Kelvin Li (community) Approve
Review via email: mp+269587@code.launchpad.net

Commit message

Update ssoclient to r20, enabling retries (ie. avoiding BadStatusLine when pooled connections are reused right after server disconnects from keep-alive)

To post a comment you must log in.
Revision history for this message
Kelvin Li (kelvin.li) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config-manager.txt'
2--- config-manager.txt 2015-06-17 04:45:36 +0000
3+++ config-manager.txt 2015-08-31 00:15:29 +0000
4@@ -34,7 +34,7 @@
5 rnr-server/branches/requests-oauthlib bzr+ssh://bazaar.isd/~ubuntuone-pqm-team/requests-oauthlib/stable;revno=16
6 rnr-server/branches/rnrclient bzr+ssh://bazaar.isd/~rnr-developers/rnr-server/rnrclient
7 rnr-server/branches/scaclient bzr+ssh://bazaar.isd/~canonical-ca-hackers/software-center/scaclient
8-rnr-server/branches/ssoclient bzr+ssh://bazaar.isd/~canonical-isd-hackers/canonical-identity-provider/ssoclient;revno=18
9+rnr-server/branches/ssoclient bzr+ssh://bazaar.isd/~canonical-isd-hackers/canonical-identity-provider/ssoclient;revno=20
10 rnr-server/branches/txstatsd bzr+ssh://bazaar.isd/~txstatsd-dev/txstatsd/trunk;revno=104
11 rnr-server/branches/conn-check-config bzr+ssh://bazaar.isd/~ubuntuone-hackers/conn-check/configs;revno=23
12 rnr-server/branches/whitenoise bzr+ssh://bazaar.isd/~ubuntuone-pqm-team/whitenoise/stable

Subscribers

People subscribed via source and target branches