[Pkg-owncloud-commits] [owncloud] 40/74: Merge pull request #12291 from owncloud/issue/10991-stable7-backport

[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 6a6b645b83384df2512d846315fd51b02af075a0
Merge: e6e0573 2f12702
Author: Joas Schilling <nickvergessen at gmx.de>
Date:   Wed Nov 19 16:19:06 2014 +0100

    Merge pull request #12291 from owncloud/issue/10991-stable7-backport
    
    Issue/10991 stable7 backport

 apps/files/tests/ajax_rename.php           |  14 +++-
 apps/files_encryption/lib/stream.php       |   1 +
 apps/files_encryption/tests/crypt.php      |  91 +++++++++++---------
 apps/files_encryption/tests/helper.php     |  44 ++++++----
 apps/files_encryption/tests/hooks.php      |  45 +++++-----
 apps/files_encryption/tests/keymanager.php |  18 ++--
 apps/files_encryption/tests/proxy.php      |  15 ++--
 apps/files_encryption/tests/share.php      | 121 ++++++++++++++-------------
 apps/files_encryption/tests/stream.php     |  40 ++++++---
 apps/files_encryption/tests/testcase.php   |  53 ++++++++++++
 apps/files_encryption/tests/trashbin.php   | 130 +++++++++++++++--------------
 apps/files_encryption/tests/util.php       |  55 ++++++------
 apps/files_encryption/tests/webdav.php     |  21 +++--
 apps/files_sharing/tests/cache.php         |  18 +++-
 lib/private/files/filesystem.php           |  13 ++-
 lib/private/files/storage/mappedlocal.php  |   3 -
 tests/lib/app.php                          |   3 +
 tests/lib/archive/tar.php                  |  11 ++-
 tests/lib/cache/file.php                   |  17 +++-
 tests/lib/cache/usercache.php              |  17 +++-
 tests/lib/files/cache/updater.php          |  15 +++-
 tests/lib/files/cache/updaterlegacy.php    |   9 +-
 tests/lib/files/cache/watcher.php          |  15 +++-
 tests/lib/files/etagtest.php               |  15 +++-
 tests/lib/files/filesystem.php             |  21 +++--
 tests/lib/files/node/integration.php       |  14 +++-
 tests/lib/files/storage/home.php           |   7 +-
 tests/lib/files/utils/scanner.php          |  18 +++-
 tests/lib/files/view.php                   |  28 ++++++-
 tests/lib/group.php                        |  58 ++++++-------
 tests/lib/group/backend.php                |   8 +-
 tests/lib/group/database.php               |  23 ++---
 tests/lib/group/dummy.php                  |   3 +-
 tests/lib/helper.php                       |   4 +
 tests/lib/helperstorage.php                |  19 ++++-
 tests/lib/image.php                        |  10 ++-
 tests/lib/largefilehelpergetfilesize.php   |  55 ++++++++----
 tests/lib/migrate.php                      |  36 ++++----
 tests/lib/preview.php                      |  38 +++++----
 tests/lib/share/share.php                  |  22 ++---
 tests/lib/streamwrappers.php               |   5 ++
 tests/lib/testcase.php                     |  30 +++++++
 tests/lib/user/backend.php                 |  21 +++--
 tests/lib/user/database.php                |  13 ++-
 tests/lib/user/dummy.php                   |   3 +-
 tests/lib/utilcheckserver.php              |   4 +
 tests/testcleanuplistener.php              |   6 ++
 47 files changed, 805 insertions(+), 425 deletions(-)

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