[Pkg-owncloud-commits] [owncloud] 61/134: Merge pull request #7819 from owncloud/stable6-datafolderexistence

[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 2c2fd5f3a065760c4781a782edf65d7feba86695
Merge: 6ccc817 288c40e
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Thu Mar 20 15:28:33 2014 +0100

    Merge pull request #7819 from owncloud/stable6-datafolderexistence
    
    [stable6] [backport] Added .ocdata file to check for data folder validity

 lib/base.php                  |   1 +
 lib/private/response.php      |   4 ++
 lib/private/setup.php         |   4 ++
 lib/private/updater.php       |   5 ++
 lib/private/util.php          |  32 +++++++++++--
 tests/lib/utilcheckserver.php | 108 ++++++++++++++++++++++++++++++++++++++++++
 version.php                   |   2 +-
 7 files changed, 151 insertions(+), 5 deletions(-)

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