[Pkg-owncloud-commits] [php-sabredav] 202/275: Merge branch 'master' into move

[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 b9ae0ba3167b2a7eb1574afacbdcbf5e3c87f742
Merge: 601d81b 5ad922a
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Sat Aug 30 13:36:47 2014 +0200

    Merge branch 'master' into move

 ChangeLog.md                                       |   6 +-
 composer.json                                      |   4 +-
 lib/CalDAV/Backend/PDO.php                         |   6 +-
 lib/CalDAV/Backend/SyncSupport.php                 |   8 +-
 lib/CalDAV/Calendar.php                            |   6 +
 lib/CalDAV/ICSExportPlugin.php                     |   2 +-
 lib/CalDAV/Schedule/IMipPlugin.php                 |   4 +-
 lib/CalDAV/Schedule/Plugin.php                     |  11 +-
 lib/CardDAV/AddressBook.php                        |   6 +
 lib/CardDAV/Backend/PDO.php                        |   6 +-
 lib/CardDAV/Backend/SyncSupport.php                |   8 +-
 lib/DAV/CorePlugin.php                             | 154 +++++++++++++--------
 lib/DAV/Server.php                                 |  22 ++-
 lib/DAV/Sync/Plugin.php                            |   2 +-
 lib/DAVACL/AbstractPrincipalCollection.php         |  14 +-
 lib/DAVACL/Exception/AceConflict.php               |   2 +-
 lib/DAVACL/Exception/NeedPrivileges.php            |   4 +-
 lib/DAVACL/Exception/NoAbstract.php                |   2 +-
 lib/DAVACL/Exception/NotRecognizedPrincipal.php    |   2 +-
 lib/DAVACL/Exception/NotSupportedPrivilege.php     |   2 +-
 lib/DAVACL/Plugin.php                              | 118 ++++++++--------
 lib/DAVACL/Principal.php                           |  34 ++---
 lib/DAVACL/PrincipalBackend/PDO.php                |  74 +++++-----
 lib/DAVACL/PrincipalCollection.php                 |   2 +-
 lib/DAVACL/Property/Acl.php                        |   6 +-
 lib/DAVACL/Property/CurrentUserPrivilegeSet.php    |  12 +-
 lib/DAVACL/Property/Principal.php                  |  10 +-
 lib/DAVACL/Property/SupportedPrivilegeSet.php      |   6 +-
 tests/Sabre/CalDAV/CalendarTest.php                |  10 +-
 tests/Sabre/CalDAV/ICSExportPluginTest.php         |   1 +
 .../Sabre/CalDAV/Schedule/PluginPropertiesTest.php |   4 +-
 tests/Sabre/CalDAV/ValidateICalTest.php            |   1 +
 tests/Sabre/CardDAV/AddressBookQueryTest.php       |   4 +-
 tests/Sabre/CardDAV/AddressBookTest.php            |   9 +-
 tests/Sabre/CardDAV/Backend/AbstractPDOTest.php    |  12 +-
 tests/Sabre/DAV/Browser/MapGetToPropFindTest.php   |   1 +
 tests/Sabre/DAV/Browser/PluginTest.php             |   4 +
 tests/Sabre/DAV/FSExt/ServerTest.php               |   7 +
 tests/Sabre/DAV/HttpDeleteTest.php                 |   2 +
 tests/Sabre/DAV/HttpPutTest.php                    |  10 +-
 tests/Sabre/DAV/Locks/PluginTest.php               |   7 +-
 tests/Sabre/DAV/ServerCopyMoveTest.php             |  32 +++--
 tests/Sabre/DAV/ServerMKCOLTest.php                |  33 +++--
 tests/Sabre/DAV/ServerPropsInfiniteDepthTest.php   |   1 +
 tests/Sabre/DAV/ServerPropsTest.php                |   4 +-
 tests/Sabre/DAV/ServerRangeTest.php                |   7 +
 tests/Sabre/DAV/ServerSimpleTest.php               |  11 +-
 tests/Sabre/DAV/SyncTokenPropertyTest.php          | 100 +++++++++++++
 tests/Sabre/DAVACL/ExpandPropertiesTest.php        |   4 +
 tests/Sabre/DAVACL/PrincipalPropertySearchTest.php |   4 +
 .../DAVACL/PrincipalSearchPropertySetTest.php      |   3 +
 51 files changed, 534 insertions(+), 270 deletions(-)


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