[Pkg-owncloud-commits] [php-sabredav] 41/275: Merge branch 'master' into calendar-auto-schedule

[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 5077c60bc44b567b66bfe43167dba3cae033a6ad
Merge: 085cb38 3b8ce85
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Fri Apr 4 17:24:34 2014 -0400

    Merge branch 'master' into calendar-auto-schedule

 .travis.yml                                 |   9 +
 ChangeLog.md                                |  44 +++-
 build.xml                                   |  21 +-
 composer.json                               |  10 +-
 lib/Sabre/CalDAV/Backend/SharingSupport.php |   6 +-
 lib/Sabre/CardDAV/Plugin.php                |  20 +-
 lib/Sabre/DAV/CorePlugin.php                |   6 +-
 lib/Sabre/DAV/Locks/Plugin.php              |   7 +
 lib/Sabre/DAV/Server.php                    |   2 +-
 lib/Sabre/DAV/XMLUtil.php                   |   6 +-
 tests/Sabre/DAV/AbstractServer.php          |   1 +
 tests/Sabre/DAV/HttpDeleteTest.php          | 135 +++++++++++
 tests/Sabre/DAV/HttpPutTest.php             | 341 ++++++++++++++++++++++++++++
 tests/Sabre/DAV/Locks/PluginTest.php        |  15 ++
 tests/Sabre/DAV/Mock/Collection.php         | 164 +++++++++++++
 tests/Sabre/DAV/Mock/File.php               | 130 +++++++++++
 tests/Sabre/DAV/ServerFinderBlockTest.php   |  53 -----
 tests/Sabre/DAV/ServerSimpleTest.php        | 142 ------------
 tests/Sabre/DAVServerTest.php               |  10 +-
 19 files changed, 899 insertions(+), 223 deletions(-)


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