[Pkg-owncloud-commits] [owncloud] 123/165: Merge pull request #15748 from owncloud/fixing-enc-filesize-once-more

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit a13088818a73ecdf6f7d6600c011e0fa49054b51
Merge: fe2cbc3 32995ac
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Mon Apr 20 18:36:23 2015 +0200

    Merge pull request #15748 from owncloud/fixing-enc-filesize-once-more
    
    Introduce Storage::getData() to allow storage implementations more contr...

 apps/files_external/lib/dropbox.php              | 14 +++++-----
 lib/private/files/cache/scanner.php              | 17 ++----------
 lib/private/files/storage/common.php             | 25 +++++++++++++++++
 lib/private/files/storage/storage.php            |  6 +++++
 lib/private/files/storage/wrapper/encryption.php | 34 +++++++++++++++++++++---
 lib/private/files/storage/wrapper/wrapper.php    |  8 ++++++
 6 files changed, 78 insertions(+), 26 deletions(-)

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