[Pkg-owncloud-commits] [owncloud-client] 296/470: Merge pull request #4648 from owncloud/handle-database-errors

[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 bd3a079a7b5474a5260723ce055069aaa071d0c9
Merge: 74a75f6 6ee7e82
Author: Olivier Goffart <olivier at woboq.com>
Date:   Mon Apr 11 15:36:46 2016 +0200

    Merge pull request #4648 from owncloud/handle-database-errors
    
    Handle setFileRecord errors #4632

 src/libsync/owncloudpropagator.cpp   | 20 +++++++++++++++++---
 src/libsync/propagatedownload.cpp    |  5 ++++-
 src/libsync/propagateremotemkdir.cpp |  5 ++++-
 src/libsync/propagateremotemove.cpp  |  5 ++++-
 src/libsync/propagateupload.cpp      |  8 ++++++--
 src/libsync/propagatorjobs.cpp       | 10 ++++++++--
 6 files changed, 43 insertions(+), 10 deletions(-)

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