Merge lp://staging/~nataliabidart/magicicada-server/embed-u1sync into lp://staging/magicicada-server
Proposed by
Natalia Bidart
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart |
| Approved revision: | 95 |
| Merged at revision: | 90 |
| Proposed branch: | lp://staging/~nataliabidart/magicicada-server/embed-u1sync |
| Merge into: | lp://staging/magicicada-server |
| Diff against target: |
2652 lines (+2362/-31) 28 files modified
config-manager.txt (+0/-1) lib/utilities/testlib.py (+0/-1) lib/utilities/utils.py (+1/-1) magicicada/filesync/services.py (+1/-2) magicicada/metrics/tests/test_base.py (+1/-2) magicicada/monitoring/reactor.py (+1/-2) magicicada/monitoring/tests/test_reactor.py (+1/-2) magicicada/server/integtests/test_sync.py (+4/-4) magicicada/server/server.py (+1/-3) magicicada/server/ssl_proxy.py (+1/-3) magicicada/server/stats.py (+1/-2) magicicada/server/tests/test_server.py (+1/-3) magicicada/server/tests/test_ssl_proxy.py (+1/-3) magicicada/server/tests/test_stats.py (+1/-2) magicicada/u1sync/__init__.py (+14/-0) magicicada/u1sync/client.py (+736/-0) magicicada/u1sync/constants.py (+26/-0) magicicada/u1sync/genericmerge.py (+86/-0) magicicada/u1sync/main.py (+443/-0) magicicada/u1sync/merge.py (+181/-0) magicicada/u1sync/metadata.py (+155/-0) magicicada/u1sync/scan.py (+84/-0) magicicada/u1sync/sync.py (+377/-0) magicicada/u1sync/tests/__init__.py (+1/-0) magicicada/u1sync/tests/test_client.py (+63/-0) magicicada/u1sync/tests/test_init.py (+22/-0) magicicada/u1sync/tests/test_merge.py (+109/-0) magicicada/u1sync/utils.py (+50/-0) |
| To merge this branch: | bzr merge lp://staging/~nataliabidart/magicicada-server/embed-u1sync |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Facundo Batista | Approve | ||
|
Review via email:
|
|||
Commit message
- Embed u1sync test dependency inside magicicada source code.
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
Awesome!