[Pkg-owncloud-commits] [php-sabredav] 09/220: Merge remote-tracking branch 'origin/master' into sharing-take-2

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit 9f4a7fe60aff7f6f6248e10af573dd16c7820a96
Merge: a0d2362 a650edf
Author: Evert Pot <me at evertpot.com>
Date:   Tue Jul 28 18:31:17 2015 -0400

    Merge remote-tracking branch 'origin/master' into sharing-take-2

 lib/CalDAV/Schedule/Plugin.php                     | 127 +++++++++++++++------
 lib/CalDAV/ShareableCalendar.php                   |   2 -
 lib/DAV/PropPatch.php                              |   9 +-
 lib/DAV/Server.php                                 |  16 ++-
 .../Sabre/CalDAV/Schedule/PluginPropertiesTest.php |  67 ++++++++---
 tests/Sabre/DAVServerTest.php                      |  35 ++++--
 6 files changed, 185 insertions(+), 71 deletions(-)

diff --cc tests/Sabre/DAVServerTest.php
index f26f2c3,473e467..865e77b
--- a/tests/Sabre/DAVServerTest.php
+++ b/tests/Sabre/DAVServerTest.php
@@@ -89,12 -90,10 +90,17 @@@ abstract class DAVServerTest extends \P
      protected $locksPlugin;
  
      /**
 +     * Sharing plugin.
 +     *
 +     * @var \Sabre\DAV\Sharing\Plugin
 +     */
 +    protected $sharingPlugin;
 +
++    /*
+      * @var Sabre\DAV\PropertyStorage\Plugin
+      */
+     protected $propertyStoragePlugin;
+ 
      /**
       * If this string is set, we will automatically log in the user with this
       * name.

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