[Pkg-owncloud-commits] [owncloud] 61/457: Merge pull request #15965 from owncloud/conditional-logging

[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 a52afb040a9bb64d782df7aabcfd0075fbfd4064
Merge: d90b837 e79c255
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Tue May 19 12:00:19 2015 +0200

    Merge pull request #15965 from owncloud/conditional-logging
    
    Conditional logging

 config/config.sample.php     | 21 +++++++++++++
 lib/private/log.php          | 75 +++++++++++++++++++++++++++++++++++++++++---
 lib/private/log/errorlog.php |  5 +--
 lib/private/log/owncloud.php | 68 +++++++++++++++++++--------------------
 lib/private/log/syslog.php   |  7 ++---
 tests/lib/logger.php         | 30 ++++++++++++++++--
 6 files changed, 156 insertions(+), 50 deletions(-)

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