lp:~xavi-garcia-mena/keeper/task-state-manager

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:keeper/devel

unity-api-1-bot: Needs Fixing (continuous-integration) on 2016-08-31

Charles Kerr (community): Approve on 2016-08-31

Diff: 1634 lines (+1003/-359)

15 files modified

include/helper/backup-helper.h (+4/-0)
include/helper/helper.h (+4/-2)
src/cli/main.cpp (+0/-1)
src/helper/backup-helper.cpp (+41/-14)
src/helper/helper.cpp (+23/-27)
src/service/CMakeLists.txt (+3/-0)
src/service/keeper-task-backup.cpp (+175/-0)
src/service/keeper-task-backup.h (+46/-0)
src/service/keeper-task.cpp (+176/-0)
src/service/keeper-task.h (+73/-0)
src/service/keeper.cpp (+16/-315)
src/service/private/keeper-task_p.h (+54/-0)
src/service/task-manager.cpp (+327/-0)
src/service/task-manager.h (+60/-0)
tests/unit/helper/fake-helper.h (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

98. By Xavi Garcia on 2016-08-30

Conflict resolved

97. By Marcus Tomlinson on 2016-08-29

merge lp:~marcustomlinson/keeper/qml-plugin

96. By Marcus Tomlinson on 2016-08-29

merge lp:~marcustomlinson/keeper/link-against-real-storage-framework

95. By Charles Kerr on 2016-08-22

merge lp:~charlesk/keeper/lp-1614764-fix-excess-signal-subscriptions

94. By Charles Kerr on 2016-08-21

merge lp:~charlesk/keeper/fix-armhf-warnings

93. By Xavi Garcia on 2016-08-19

merge lp:~xavi-garcia-mena/keeper/ual-moved-to-helper-class

92. By Charles Kerr on 2016-08-18

Corrected fix for the speed test failures. Fixes: https://bugs.launchpad.net/bugs/1607393.

Approved by unity-api-1-bot, Xavi Garcia.

91. By Charles Kerr on 2016-08-12

merge lp:~charlesk/keeper/fix-speed-test

90. By Xavi Garcia on 2016-08-12

merge lp:~xavi-garcia-mena/keeper/sf-error-handling-cleanup-checking-state

89. By Charles Kerr on 2016-08-12

insert tracers into helper::speed property code