Merge lp:~nataliabidart/ubuntuone-client/stable-3-0-update-2.99.91.1 into lp:ubuntuone-client/stable-3-0
Proposed by
Natalia Bidart
Status: | Merged | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | dobey | ||||||||||||||||
Approved revision: | 1180 | ||||||||||||||||
Merged at revision: | 1179 | ||||||||||||||||
Proposed branch: | lp:~nataliabidart/ubuntuone-client/stable-3-0-update-2.99.91.1 | ||||||||||||||||
Merge into: | lp:ubuntuone-client/stable-3-0 | ||||||||||||||||
Diff against target: |
235 lines (+114/-8) 6 files modified
tests/platform/windows/test_os_helper.py (+8/-0) tests/proxy/test_tunnel_server.py (+30/-0) tests/syncdaemon/test_tunnel_runner.py (+55/-2) ubuntuone/platform/windows/os_helper.py (+6/-2) ubuntuone/proxy/tunnel_server.py (+2/-3) ubuntuone/syncdaemon/tunnel_runner.py (+13/-1) |
||||||||||||||||
To merge this branch: | bzr merge lp:~nataliabidart/ubuntuone-client/stable-3-0-update-2.99.91.1 | ||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Manuel de la Peña (community) | Approve | ||
Roberto Alsina (community) | Approve | ||
Review via email: mp+99549@code.launchpad.net |
Commit message
[ Alejandro J. Cura <email address hidden> ]
- reactor.
the binary to run (LP: #965897).
- Stop the proxy tunnel when stopping the reactor (LP: #963485).
- Don't write the proxy credentials to the log (LP: #963568).
[ Brian Curtin <email address hidden> ]
- Loosen the is_root check on Windows to allow Windows XP users,
who commonly run with Administrator rights, to start U1 properly
(LP: #930398).
To post a comment you must log in.
+1