lp://staging/~nataliabidart/magicicada-server/embed-u1sync

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/magicicada-server at revision 90

Facundo Batista: Approve on 2018-04-23

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

95. By Natalia Bidart on 2018-04-20

Revert changes to Makefile.

94. By Natalia Bidart on 2018-04-20

Fixed import paths.

93. By Natalia Bidart on 2018-04-20

Added u1sync inside magicicada folder.

92. By Natalia Bidart on 2018-04-19

Merged trunk in

91. By Natalia Bidart on 2018-04-19

- Embed u1sync inside source code.

90. By Natalia Bidart on 2018-04-18

Added u1sync from lp:~facundo/u1sync/opensourcing

89. By Natalia Bidart on 2018-04-18

Removed folder.

88. By Natalia Bidart on 2018-04-18

- Removed u1sync sourcecode link.

87. By Natalia Bidart on 2018-04-13

[r=nataliabidart] - Restored protocol link in sourcedeps to point to magicicada-protocol folder and make the protocol wheel install in that folder.

86. By Natalia Bidart on 2018-04-13

[r=facundo] - Use devel and non-devel dependencies from a virtualenv.
- Clean former usage of revno from versioninfo.
- Provide travis and docker files so tests can be run in Travis using a xenial image.