Merge lp:~alecu/ubuntuone-client/fix-broken-tunnel into lp:ubuntuone-client
Proposed by
Alejandro J. Cura
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Alejandro J. Cura | ||||||||
Approved revision: | 1219 | ||||||||
Merged at revision: | 1221 | ||||||||
Proposed branch: | lp:~alecu/ubuntuone-client/fix-broken-tunnel | ||||||||
Merge into: | lp:ubuntuone-client | ||||||||
Diff against target: |
145 lines (+59/-4) 4 files modified
tests/proxy/test_tunnel_server.py (+33/-0) tests/syncdaemon/test_tunnel_runner.py (+9/-0) ubuntuone/proxy/tunnel_server.py (+10/-2) ubuntuone/syncdaemon/tunnel_runner.py (+7/-2) |
||||||||
To merge this branch: | bzr merge lp:~alecu/ubuntuone-client/fix-broken-tunnel | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Diego Sarmentero (community) | Approve | ||
Eric Casteleijn (community) | Approve | ||
Review via email: mp+100133@code.launchpad.net |
To post a comment you must log in.
+1