Merge lp://staging/~dobey/ubuntuone-client/use-dirspec into lp://staging/ubuntuone-client
Proposed by
dobey
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Brian Curtin | ||||
Approved revision: | 1264 | ||||
Merged at revision: | 1263 | ||||
Proposed branch: | lp://staging/~dobey/ubuntuone-client/use-dirspec | ||||
Merge into: | lp://staging/ubuntuone-client | ||||
Diff against target: |
355 lines (+28/-73) 16 files modified
bin/ubuntuone-syncdaemon (+1/-1) contrib/dump_metadata.py (+1/-1) contrib/testing/testcase.py (+1/-1) data/source_ubuntuone-client.py (+1/-1) tests/platform/test_logger.py (+3/-5) tests/syncdaemon/test_config.py (+2/-2) tests/syncdaemon/test_main.py (+1/-1) ubuntuone/platform/__init__.py (+2/-2) ubuntuone/platform/credentials/__init__.py (+1/-4) ubuntuone/platform/logger/__init__.py (+7/-0) ubuntuone/platform/xdg_base_directory/__init__.py (+0/-40) ubuntuone/proxy/logger.py (+1/-1) ubuntuone/status/logger.py (+1/-4) ubuntuone/syncdaemon/config.py (+2/-4) ubuntuone/syncdaemon/logger.py (+1/-3) ubuntuone/syncdaemon/main.py (+3/-3) |
||||
To merge this branch: | bzr merge lp://staging/~dobey/ubuntuone-client/use-dirspec | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brian Curtin (community) | Approve | ||
Roberto Alsina (community) | Approve | ||
Review via email:
|
Commit message
Avoid using ubuntu_
Move ubuntuone_log_dir to ubuntuone.
Remove ubuntuone.
To post a comment you must log in.