Merge lp://staging/~nataliabidart/magicicada-client/use-protocol-from-wheel into lp://staging/magicicada-client
Proposed by
Natalia Bidart
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart |
| Approved revision: | 1443 |
| Merged at revision: | 1443 |
| Proposed branch: | lp://staging/~nataliabidart/magicicada-client/use-protocol-from-wheel |
| Merge into: | lp://staging/magicicada-client |
| Diff against target: |
544 lines (+69/-125) 18 files modified
.bzrignore (+0/-1) .coveragerc (+0/-27) HACKING (+2/-6) Makefile (+3/-15) dependencies.txt (+0/-1) requirements.txt (+1/-0) ubuntuone/platform/tests/linux/test_vm.py (+3/-4) ubuntuone/syncdaemon/action_queue.py (+12/-9) ubuntuone/syncdaemon/hash_queue.py (+3/-8) ubuntuone/syncdaemon/interaction_interfaces.py (+3/-5) ubuntuone/syncdaemon/sync.py (+6/-6) ubuntuone/syncdaemon/tests/test_action_queue.py (+7/-7) ubuntuone/syncdaemon/tests/test_hashqueue.py (+6/-7) ubuntuone/syncdaemon/tests/test_interaction_interfaces.py (+6/-8) ubuntuone/syncdaemon/tests/test_localrescan.py (+2/-3) ubuntuone/syncdaemon/tests/test_sync.py (+4/-5) ubuntuone/syncdaemon/tests/test_vm.py (+5/-8) ubuntuone/syncdaemon/volume_manager.py (+6/-5) |
| To merge this branch: | bzr merge lp://staging/~nataliabidart/magicicada-client/use-protocol-from-wheel |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Facundo Batista | Approve | ||
|
Review via email:
|
|||
Commit message
- Use protocol from wheel release.
- Fix copyright headers from modified files.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Rock!