← Back to branch summary

~xavi-garcia-mena/keeper/mcloud-provided-crash-test

~xavi-garcia-mena/keeper/mcloud-provided-crash-test

Viewing all changes in revision 96.

Committer: Charles Kerr
Author(s): Marcus Tomlinson
Date: 2016-08-29 21:05:21 UTC
mfrom: (91.4.15 trunk)
Revision ID: charles.kerr@canonical.com-20160829210521-tcwrqv2nivy7t1ym

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

files modified:
CMakeLists.txt

src/helper/backup-helper.cpp

src/service/CMakeLists.txt

src/storage-framework/storage_framework_client.cpp

src/storage-framework/storage_framework_client.h

tests/CMakeLists.txt

tests/fakes/fake-backup-helper.cpp

tests/integration/helpers/helpers-test-failure.cpp

tests/integration/helpers/test-helpers-base.cpp

tests/unit/helper/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

src/helper/backup-helper.cpp

src/service/CMakeLists.txt

src/storage-framework/storage_framework_client.cpp

src/storage-framework/storage_framework_client.h

tests/CMakeLists.txt

tests/fakes/fake-backup-helper.cpp

tests/integration/helpers/helpers-test-failure.cpp

tests/integration/helpers/test-helpers-base.cpp

tests/unit/helper/CMakeLists.txt

Older »