Merge lp://qastaging/~cmiller/desktopcouch/replication-removeslash-and-loghttp500 into lp://qastaging/desktopcouch
Proposed by
Chad Miller
| Status: | Merged |
|---|---|
| Approved by: | dobey |
| Approved revision: | 266 |
| Merged at revision: | 263 |
| Proposed branch: | lp://qastaging/~cmiller/desktopcouch/replication-removeslash-and-loghttp500 |
| Merge into: | lp://qastaging/desktopcouch |
| Diff against target: |
71 lines (+22/-8) 2 files modified
desktopcouch/application/pair/couchdb_pairing/couchdb_io.py (+14/-4) desktopcouch/records/http.py (+8/-4) |
| To merge this branch: | bzr merge lp://qastaging/~cmiller/desktopcouch/replication-removeslash-and-loghttp500 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey (community) | Approve | ||
| Eric Casteleijn (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Ah HTTP error (say, from proxy server) may not return JSON document so we can't depend on being able to decode one. Catch and log those errors.
python-couchdb prepends its own "/" in requests, so our use of them can cause errors when talking to remote hosts.
To post a comment you must log in.
Revision history for this message
| Eric Casteleijn (thisfred) wrote | # |
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Awesome! +1