[Pkg-owncloud-commits] [owncloud] 31/118: Merge pull request #14669 from owncloud/enc-migrate-disable-updater-stable8

[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 7e87cdab4a512987e5b6a3f94b340618d40cd5a6
Merge: 5effc4a 8f23742
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Wed Mar 11 16:18:04 2015 +0100

    Merge pull request #14669 from owncloud/enc-migrate-disable-updater-stable8
    
    [stable8] Disable the cache updater when doing the encryption migration

 apps/files_encryption/lib/migration.php | 28 +++++++++++++++++-----------
 lib/private/files/cache/updater.php     | 21 ++++++++++++++++++++-
 lib/private/files/view.php              |  7 +++++++
 tests/lib/files/cache/updater.php       | 30 ++++++++++++++++++++++++++++++
 4 files changed, 74 insertions(+), 12 deletions(-)

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