[Pkg-owncloud-commits] [owncloud] 131/215: Merge pull request #14764 from owncloud/shared-etag-propagate

[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 de8c15e1a46e33a20af1bad97a8cf27fced84539
Merge: 5fa5f46 5304afb
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Apr 28 10:58:50 2015 +0200

    Merge pull request #14764 from owncloud/shared-etag-propagate
    
    Propagate etags across shared storages

 apps/files_sharing/appinfo/app.php                 |  37 ++-
 apps/files_sharing/appinfo/application.php         | 124 ++++++++
 apps/files_sharing/appinfo/routes.php              |   1 -
 apps/files_sharing/application.php                 | 115 -------
 apps/files_sharing/lib/helper.php                  |   2 -
 apps/files_sharing/lib/mountprovider.php           |  72 +++++
 .../lib/propagation/changewatcher.php              |  76 +++++
 .../lib/propagation/propagationmanager.php         | 112 +++++++
 .../lib/propagation/recipientpropagator.php        | 118 +++++++
 apps/files_sharing/lib/sharedmount.php             |  21 +-
 apps/files_sharing/lib/sharedstorage.php           |  50 +--
 apps/files_sharing/lib/updater.php                 |  39 ---
 apps/files_sharing/tests/cache.php                 |   4 +-
 .../tests/controller/sharecontroller.php           |   2 +-
 apps/files_sharing/tests/etagpropagation.php       | 345 +++++++++++++++++++++
 apps/files_sharing/tests/permissions.php           |   4 +-
 apps/files_sharing/tests/sharedstorage.php         |   5 +-
 .../tests/{propagation.php => sizepropagation.php} |   4 +-
 apps/files_sharing/tests/testcase.php              |   9 +-
 apps/files_sharing/tests/watcher.php               |   4 +-
 apps/files_trashbin/tests/trashbin.php             |   4 +-
 apps/files_versions/tests/versions.php             |   4 +-
 lib/private/connector/sabre/file.php               |   1 +
 lib/private/files/cache/changepropagator.php       |   5 +-
 lib/private/files/cache/updater.php                |   4 +
 lib/private/files/view.php                         |   4 +
 lib/private/share/share.php                        |  24 ++
 tests/lib/connector/sabre/file.php                 |   1 -
 tests/lib/files/etagtest.php                       |   4 +-
 29 files changed, 976 insertions(+), 219 deletions(-)


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