Merge lp://qastaging/~ralsina/ubuntuone-client/el-sendero-de-warren-sanchez into lp://qastaging/ubuntuone-client
Proposed by
Roberto Alsina
| Status: | Merged |
|---|---|
| Approved by: | Roberto Alsina |
| Approved revision: | 1334 |
| Merged at revision: | 1331 |
| Proposed branch: | lp://qastaging/~ralsina/ubuntuone-client/el-sendero-de-warren-sanchez |
| Merge into: | lp://qastaging/ubuntuone-client |
| Diff against target: |
151 lines (+36/-7) 3 files modified
tests/platform/linux/eventlog/test_zg_listener.py (+2/-1) tests/syncdaemon/test_action_queue.py (+30/-4) ubuntuone/syncdaemon/action_queue.py (+4/-2) |
| To merge this branch: | bzr merge lp://qastaging/~ralsina/ubuntuone-client/el-sendero-de-warren-sanchez |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Facundo Batista (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Added self.path to Upload and Download objects (LP:1061490).
Description of the change
Make it so Upload and Download objects have a self.path, which is used by the sync menu.
To post a comment you must log in.
Revision history for this message
| Facundo Batista (facundo) | # |
review:
Approve
Revision history for this message
| Ubuntu One Auto Pilot (otto-pilot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.