[Pkg-owncloud-commits] [owncloud-client] 367/484: Merge pull request #4159 from owncloud/fix_3490

[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 b0c29d5c66667be201af3bba858305f541c5dd88
Merge: 41a6f6d be88e5a
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Wed Nov 18 16:55:53 2015 +0100

    Merge pull request #4159 from owncloud/fix_3490
    
    csync updater: Handle file firewall reply codes correctly: Ignore the files.
    
    Fixes #3490

 csync/src/csync.h              |  3 ++-
 csync/src/csync_macros.h       |  1 +
 csync/src/csync_update.c       | 46 +++++++++++++++++++++++++++++-------------
 src/libsync/discoveryphase.cpp |  4 +++-
 src/libsync/syncengine.cpp     |  8 ++++++++
 5 files changed, 46 insertions(+), 16 deletions(-)

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