Merge lp://qastaging/~diegosarmentero/ubuntuone-client/fix-tests-jenkins into lp://qastaging/ubuntuone-client
Proposed by
Diego Sarmentero
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | dobey | ||||
| Approved revision: | 1354 | ||||
| Merged at revision: | 1352 | ||||
| Proposed branch: | lp://qastaging/~diegosarmentero/ubuntuone-client/fix-tests-jenkins | ||||
| Merge into: | lp://qastaging/ubuntuone-client | ||||
| Diff against target: |
37 lines (+4/-5) 2 files modified
ubuntuone/platform/ipc/ipc_client.py (+4/-4) ubuntuone/syncdaemon/filesystem_manager.py (+0/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~diegosarmentero/ubuntuone-client/fix-tests-jenkins | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey (community) | Approve | ||
| Mike McCracken (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Move the search_files method to the correct class (LP: #1070991).
To post a comment you must log in.
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
Works for me. Note that this branch also fixes the control-panel IPC for windows/darwin, not just the jenkins tests.