[Pkg-owncloud-commits] [owncloud] 19/28: Merge pull request #6225 from owncloud/stable6-backgroundscan-reuse-etag

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 3842c0d76635a4f1272b8dcfa2a7ba8392edf524
Merge: 1475245 8369c1f
Author: Frank Karlitschek <frank at owncloud.org>
Date:   Fri Dec 6 11:55:23 2013 -0800

    Merge pull request #6225 from owncloud/stable6-backgroundscan-reuse-etag
    
    Stable6 backgroundscan reuse etag

 config/config.sample.php            |  0
 lib/private/files/cache/scanner.php |  2 +-
 tests/lib/files/etagtest.php        | 79 +++++++++++++++++++++++++++++++++++++
 tests/lib/files/filesystem.php      | 48 +++++++++++-----------
 4 files changed, 104 insertions(+), 25 deletions(-)

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