[Pkg-owncloud-commits] [owncloud] 67/129: Merge pull request #19882 from owncloud/backport-ceph-stop-script-changes

[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 84e69f4931124439a3c478693e5cf500a263dc93
Merge: c2f5fd4 f4e68ca
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Oct 21 09:50:58 2015 +0200

    Merge pull request #19882 from owncloud/backport-ceph-stop-script-changes
    
    Backport objectstore fixes to 8.2

 apps/encryption/tests/lib/MigrationTest.php        | 27 ++++++++++++++++-
 .../tests/command/deleteorphanedfilestest.php      |  7 ++++-
 apps/files_sharing/tests/sharedstorage.php         | 11 ++++---
 apps/files_sharing/tests/watcher.php               | 10 +++----
 apps/files_trashbin/lib/trashbin.php               |  5 ++--
 apps/files_trashbin/tests/trashbin.php             | 30 +++++++++++--------
 apps/files_versions/lib/storage.php                | 35 ++++++++++++++++------
 apps/files_versions/tests/versions.php             |  5 ++--
 autotest.sh                                        |  1 +
 lib/private/files/cache/updater.php                | 16 +++++-----
 .../files/objectstore/objectstorestorage.php       |  4 +--
 lib/private/share/share.php                        |  4 ++-
 tests/lib/connector/sabre/file.php                 | 15 ++++++----
 tests/lib/files/cache/updater.php                  | 18 +++++++++++
 tests/lib/files/objectstore/swift.php              |  4 +++
 tests/objectstore/stop-swift-ceph.sh               | 24 ++++++++-------
 16 files changed, 150 insertions(+), 66 deletions(-)


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