[Pkg-owncloud-commits] [owncloud] 12/46: Merge pull request #10732 from owncloud/make_skeleton_compatible_with_objectstore_minimal_stable7

[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 b3acb2a1e718098d1be21e8eaae06de1dd07f182
Merge: af72528 61873e4
Author: Jörn Friedrich Dreyer <jfd at butonic.de>
Date:   Thu Oct 16 16:05:56 2014 +0200

    Merge pull request #10732 from owncloud/make_skeleton_compatible_with_objectstore_minimal_stable7
    
    make skeleton compatible with objectstore

 apps/files_encryption/lib/helper.php               |  2 +-
 apps/files_encryption/tests/crypt.php              |  8 ++++
 apps/files_encryption/tests/helper.php             | 18 ++++---
 apps/files_encryption/tests/hooks.php              |  8 ++++
 apps/files_encryption/tests/keymanager.php         |  8 ++++
 apps/files_encryption/tests/proxy.php              |  8 ++++
 apps/files_encryption/tests/share.php              |  8 ++++
 apps/files_encryption/tests/stream.php             |  8 ++++
 apps/files_encryption/tests/trashbin.php           |  8 ++++
 apps/files_encryption/tests/util.php               |  9 ++++
 apps/files_encryption/tests/webdav.php             |  8 ++++
 apps/files_sharing/tests/base.php                  | 37 ++++++++-------
 .../files/objectstore/homeobjectstorestorage.php   |  6 ---
 .../files/objectstore/objectstorestorage.php       |  5 +-
 lib/private/server.php                             | 15 ++++++
 lib/private/util.php                               | 55 ++++++++++++----------
 16 files changed, 152 insertions(+), 59 deletions(-)


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