[Pkg-owncloud-commits] [owncloud] 56/273: Merge pull request #9193 from owncloud/sharing_etag_propagation

[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 1822bba5e941862323117e2625361098ce729155
Merge: a515445 38ff817
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Thu Jun 26 10:26:24 2014 +0200

    Merge pull request #9193 from owncloud/sharing_etag_propagation
    
    make sure that the etags get propagated correctly

 apps/files_sharing/appinfo/app.php   |  10 +--
 apps/files_sharing/lib/helper.php    |  14 +++++
 apps/files_sharing/lib/updater.php   |  62 +++++++++++++++++++
 apps/files_sharing/tests/updater.php | 115 ++++++++++++++++++++++++++++++++++-
 lib/private/share/helper.php         |  22 +++++--
 lib/private/share/share.php          |  60 +++++++++++++++---
 6 files changed, 261 insertions(+), 22 deletions(-)

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