Merge lp:~jdobrien/ubuntuone-client/bugfix-553547 into lp:ubuntuone-client
Proposed by
John O'Brien
Status: | Merged |
---|---|
Approved by: | Eric Casteleijn |
Approved revision: | 474 |
Merged at revision: | not available |
Proposed branch: | lp:~jdobrien/ubuntuone-client/bugfix-553547 |
Merge into: | lp:ubuntuone-client |
Diff against target: |
145 lines (+33/-28) 5 files modified
tests/syncdaemon/test_dbus.py (+2/-2) tests/syncdaemon/test_vm.py (+4/-4) ubuntuone/syncdaemon/action_queue.py (+8/-3) ubuntuone/syncdaemon/event_queue.py (+2/-1) ubuntuone/syncdaemon/volume_manager.py (+17/-18) |
To merge this branch: | bzr merge lp:~jdobrien/ubuntuone-client/bugfix-553547 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Eric Casteleijn (community) | Approve | ||
Rick McBride (community) | Approve | ||
Review via email: mp+22953@code.launchpad.net |
Commit message
Fix a discrepancy between the client and protocol where share_deletion notifications are handled.
Description of the change
This branch makes the adjustments to the client so it is compatible with the storage protocol branch lp:ubuntuone-storage-protocol/split-share-change and must be tested with that revision.
To post a comment you must log in.
Looks good, tests pass