[Pkg-owncloud-commits] [owncloud] 43/199: Merge pull request #8674 from owncloud/watch-policy

[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 48d0cebc42e98e3fe3fbb7c1b5b4fdc90db4cf2b
Merge: 790c0e8 151c484
Author: Frank Karlitschek <frank at owncloud.org>
Date:   Mon May 26 10:48:44 2014 +0200

    Merge pull request #8674 from owncloud/watch-policy
    
    Add a config option for setting the filesystem watcher policy

 config/config.sample.php             | 11 ++++++++++-
 lib/private/files/cache/watcher.php  |  2 +-
 lib/private/files/storage/common.php |  2 ++
 3 files changed, 13 insertions(+), 2 deletions(-)


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