[Pkg-owncloud-commits] [php-sabredav] 29/31: Merge tag 'upstream/2.0.4'

[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 d2635d9136e865f17892dff7660b8807ab227a99
Merge: 2d3dc69 8d1274c
Author: David Prévot <taffit at debian.org>
Date:   Wed Aug 27 13:32:51 2014 -0400

    Merge tag 'upstream/2.0.4'
    
    Upstream version 2.0.4
    
    # gpg: Signature faite le mer. 27 août 2014 13:32:37 AST
    # gpg:                avec la clef RSA B82A217AFDFE09F2
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> »
    # gpg:                 alias « David Prévot <davidp at altern.org> »
    # gpg:                 alias « David Prévot <davidp at no-log.org> »
    # gpg:                 alias « David Prévot <taffit at debian.org> »
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2

 .travis.yml                                        |   1 -
 ChangeLog.md                                       |  17 +++-
 bin/migrateto20.php                                |   2 +-
 composer.json                                      |   4 +-
 examples/addressbookserver.php                     |   1 +
 examples/calendarserver.php                        |   2 +
 examples/sql/mysql.calendars.sql                   |   2 +-
 examples/sql/pgsql.calendars.sql                   |   4 +-
 lib/CalDAV/Backend/PDO.php                         |   6 +-
 lib/CalDAV/Backend/SyncSupport.php                 |   8 +-
 lib/CalDAV/Calendar.php                            |   6 ++
 lib/CalDAV/ICSExportPlugin.php                     |   2 +-
 lib/CardDAV/AddressBook.php                        |   6 ++
 lib/CardDAV/Backend/PDO.php                        |   6 +-
 lib/CardDAV/Backend/SyncSupport.php                |   8 +-
 lib/DAV/CorePlugin.php                             |  50 +++++++++++
 lib/DAV/Locks/Backend/File.php                     |   9 +-
 lib/DAV/Locks/Plugin.php                           |  18 ++++
 lib/DAV/Server.php                                 |   9 ++
 lib/DAV/Sync/Plugin.php                            |   2 +-
 lib/DAV/Version.php                                |   2 +-
 tests/Sabre/CalDAV/Backend/AbstractPDOTest.php     |   4 +-
 tests/Sabre/CalDAV/CalendarQueryValidatorTest.php  |  48 +++++-----
 tests/Sabre/CalDAV/CalendarTest.php                |  10 ++-
 tests/Sabre/CardDAV/AddressBookTest.php            |   9 +-
 tests/Sabre/CardDAV/Backend/AbstractPDOTest.php    |  12 +--
 .../Sabre/DAV/Locks/Backend/Mock.php               |  59 ++----------
 tests/Sabre/DAV/Locks/Plugin2Test.php              |  69 ++++++++++++++
 tests/Sabre/DAV/SyncTokenPropertyTest.php          | 100 +++++++++++++++++++++
 tests/Sabre/DAVServerTest.php                      |  16 ++++
 tests/bootstrap.php                                |   5 ++
 tests/phpunit.xml                                  |   2 +-
 32 files changed, 385 insertions(+), 114 deletions(-)

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