lp://qastaging/~charlesk/keeper/connection-helper

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/keeper/devel at revision 102

unity-api-1-bot: Needs Fixing (continuous-integration) on 2016-09-07

Xavi Garcia (community): Approve on 2016-09-07

Diff: 2093 lines (+676/-498)

48 files modified

include/client/client.h (+1/-1)
include/helper/backup-helper.h (+5/-8)
include/helper/helper.h (+1/-2)
include/helper/metadata.h (+1/-2)
src/cli/CMakeLists.txt (+3/-0)
src/helper/CMakeLists.txt (+2/-0)
src/helper/backup-helper.cpp (+78/-66)
src/helper/helper.cpp (+5/-7)
src/helper/metadata.cpp (+1/-5)
src/service/CMakeLists.txt (+2/-2)
src/service/app-const.h (+0/-3)
src/service/backup-choices.cpp (+1/-1)
src/service/backup-choices.h (+1/-1)
src/service/keeper-task-backup.cpp (+30/-104)
src/service/keeper-task-backup.h (+3/-3)
src/service/keeper-task.cpp (+18/-14)
src/service/keeper-task.h (+3/-5)
src/service/keeper-user.h (+1/-1)
src/service/keeper.cpp (+16/-47)
src/service/metadata-provider.h (+1/-1)
src/service/private/keeper-task_p.h (+2/-2)
src/service/restore-choices.cpp (+1/-1)
src/service/restore-choices.h (+1/-1)
src/service/task-manager.cpp (+27/-38)
src/service/task-manager.h (+3/-3)
src/storage-framework/CMakeLists.txt (+3/-1)
src/storage-framework/sf-uploader.cpp (+55/-0)
src/storage-framework/sf-uploader.h (+45/-0)
src/storage-framework/storage_framework_client.cpp (+107/-112)
src/storage-framework/storage_framework_client.h (+25/-28)
src/storage-framework/uploader.h (+44/-0)
src/tar/tar-creator.cpp (+1/-1)
src/tar/tar-creator.h (+1/-1)
src/util/CMakeLists.txt (+28/-9)
src/util/connection-helper.h (+120/-0)
tests/dbusmock/CMakeLists.txt (+12/-13)
tests/fakes/upstart/upstart-job-mock.cpp (+8/-0)
tests/integration/CMakeLists.txt (+3/-1)
tests/integration/helpers/CMakeLists.txt (+4/-2)
tests/integration/helpers/helpers-test-failure.cpp (+1/-1)
tests/integration/helpers/helpers-test.cc (+2/-2)
tests/integration/helpers/test-helpers-base.cpp (+1/-1)
tests/integration/helpers/test-helpers-base.h (+1/-1)
tests/unit/CMakeLists.txt (+3/-1)
tests/unit/helper/fake-helper.h (+0/-1)
tests/unit/tar/tar-creator-libarchive-failure-test.cpp (+3/-3)
tests/utils/file-utils.cpp (+1/-1)
tests/utils/file-utils.h (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

131. By Charles Kerr on 2016-09-06

in KeeperTask, remove unneeded #include of app-const.h

130. By Charles Kerr on 2016-09-06

remove unused FOLDER_HELPER_BIN_PATH

129. By Charles Kerr on 2016-09-06

in TaskManager::start_task(), avoid redundant traversal of the task_data_ map

128. By Charles Kerr on 2016-09-06

remove unneeded KeeperTaskBackupPrivate::on_helper_state_changed()

127. By Charles Kerr on 2016-09-06

(copyediting) tweak whitespace in keeper-task.h

126. By Charles Kerr on 2016-09-06

change TaskManagerPrivate::on_helper_state_changed() visibility from public to private

125. By Charles Kerr on 2016-09-06

remove Metadata's user-defined constructor (-Wdeprecated)

124. By Charles Kerr on 2016-09-06

make KeeperClientPrivate's definition and forward declaration match, was declared as class but defined as struct (clang++ -Wmismatched-tags)

123. By Charles Kerr on 2016-09-06

remove unused BackupHelperPrivate::on_helper_process_stopped() (cppcheck 1.7.5)

122. By Charles Kerr on 2016-09-06

remove raw strings that confuse cppcheck 1.7.5 in yakkety