[Pkg-owncloud-commits] [owncloud] 31/83: Merge pull request #4957 from owncloud/fixing-4866-stable5

[David Prévot]

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

taffit pushed a commit to branch 5.0
in repository owncloud.

commit 2565a94e7d0785433dff73a022ae712bee24ca9f
Merge: 6eae96b e7c903b
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri Nov 22 08:09:59 2013 -0800

    Merge pull request #4957 from owncloud/fixing-4866-stable5
    
    Backport of #4869 to stable5 (recreate an etag within the scanner if the cache contains an empty etag)

 db_structure.xml                  |  2 +-
 lib/files/cache/cache.php         |  4 +++-
 lib/files/cache/scanner.php       | 23 ++++++++++++++++++-
 tests/lib/files/cache/scanner.php | 47 ++++++++++++++++++++++++++++++---------
 4 files changed, 63 insertions(+), 13 deletions(-)

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