[Pkg-owncloud-commits] [owncloud-client] 189/484: Merge pull request #3951 from ckamm/checksum

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 251679253ae5304f5012ad8dea50898c4bbcf7da
Merge: 64756c5 496b1e9
Author: ckamm <mail at ckamm.de>
Date:   Thu Oct 29 10:40:24 2015 +0100

    Merge pull request #3951 from ckamm/checksum
    
    Checksums stored in database #3735

 src/libsync/capabilities.cpp                  |  25 +++-
 src/libsync/capabilities.h                    |  10 +-
 src/libsync/owncloudpropagator.cpp            |   6 +-
 src/libsync/ownsql.cpp                        |   5 +
 src/libsync/ownsql.h                          |   3 +
 src/libsync/propagatedownload.cpp             |  27 +++-
 src/libsync/propagatedownload.h               |   2 +-
 src/libsync/propagateupload.cpp               |  68 ++++++----
 src/libsync/propagateupload.h                 |   2 +-
 src/libsync/propagatorjobs.h                  |   1 -
 src/libsync/syncengine.cpp                    |   2 +-
 src/libsync/syncfileitem.h                    |   3 +-
 src/libsync/syncjournaldb.cpp                 | 185 +++++++++++++++++++++++++-
 src/libsync/syncjournaldb.h                   |  13 ++
 src/libsync/syncjournalfilerecord.cpp         |   9 +-
 src/libsync/syncjournalfilerecord.h           |   2 +
 src/libsync/transmissionchecksumvalidator.cpp | 170 +++++++++++------------
 src/libsync/transmissionchecksumvalidator.h   |  88 +++++++-----
 test/testsyncjournaldb.h                      |  47 +++++++
 test/testtranschecksumvalidator.h             |  60 ++++-----
 20 files changed, 534 insertions(+), 194 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git