Merge lp:~facundo/ubuntuone-client/configurable-two-values into lp:ubuntuone-client
Proposed by
Facundo Batista
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Guillermo Gonzalez | ||||
Approved revision: | 965 | ||||
Merged at revision: | 964 | ||||
Proposed branch: | lp:~facundo/ubuntuone-client/configurable-two-values | ||||
Merge into: | lp:ubuntuone-client | ||||
Diff against target: |
272 lines (+117/-10) 6 files modified
data/syncdaemon.conf (+9/-0) tests/platform/linux/eventlog/test_zg_listener.py (+5/-2) tests/syncdaemon/test_action_queue.py (+22/-4) tests/syncdaemon/test_config.py (+50/-0) ubuntuone/syncdaemon/action_queue.py (+11/-4) ubuntuone/syncdaemon/config.py (+20/-0) |
||||
To merge this branch: | bzr merge lp:~facundo/ubuntuone-client/configurable-two-values | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Guillermo Gonzalez | Approve | ||
Lucio Torre (community) | Approve | ||
Review via email: mp+58573@code.launchpad.net |
Commit message
Use "simultaneous transfers" and "maximum payload size" from configuration (LP: #767466).
Description of the change
Use "simultaneous transfers" and "maximum payload size" from configuration.
"simult_transfers" moved from a code constant to a value from configuration, and "max_payload_size" is set in the protocol also from the configuration.
Added configuration for these two values, with sensible defaults; also, methods added to get and set these values.
Tests included for everything.
To post a comment you must log in.
+1