[Pkg-owncloud-commits] [php-sabredav] 40/42: Merge tag 'upstream/2.1.1'

[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 a6d462b6d799fcbce27e8e3667dfba9470b3cdea
Merge: d83e37c 0a1b57d
Author: David Prévot <taffit at debian.org>
Date:   Fri Nov 28 16:01:46 2014 -0400

    Merge tag 'upstream/2.1.1'
    
    Upstream version 2.1.1
    
    # gpg: Signature faite le ven. 28 nov. 2014 16:01:22 AST
    # gpg:                avec la clef RSA 058C1CF944F6BD3C
    # 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
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 .travis.yml                                        |   3 -
 ChangeLog.md                                       |  39 +++++
 bin/migrateto20.php                                |   4 +-
 bin/migrateto21.php                                |  23 +--
 composer.json                                      |   2 +-
 lib/CalDAV/Backend/PDO.php                         |   8 +-
 lib/CalDAV/CalendarRootNode.php                    |   2 +
 lib/CalDAV/ICSExportPlugin.php                     |   1 +
 lib/CalDAV/Plugin.php                              | 109 ++++++++++---
 lib/CalDAV/Schedule/IMipPlugin.php                 |  11 +-
 lib/CalDAV/Schedule/ISchedulingObject.php          |   2 +-
 lib/CalDAV/Schedule/Plugin.php                     |  27 +++-
 lib/CalDAV/Schedule/SchedulingObject.php           | 116 +-------------
 lib/DAV/Auth/Backend/Apache.php                    |   3 +
 lib/DAV/Version.php                                |   2 +-
 .../Sabre/CalDAV/ExpandEventsFloatingTimeTest.php  | 170 +++++++++++++++++++++
 tests/Sabre/CalDAV/FreeBusyReportTest.php          |  29 +++-
 .../Sabre/CalDAV/Property/EmailAddressSetTest.php  |  43 ++++++
 .../Sabre/CalDAV/Schedule/FreeBusyRequestTest.php  |   3 +-
 tests/Sabre/CalDAV/Schedule/IMipPluginTest.php     |  46 +++++-
 .../Sabre/CalDAV/Schedule/PluginPropertiesTest.php |  17 +++
 ... => PluginPropertiesWithSharedCalendarTest.php} |  29 +++-
 tests/Sabre/DAV/Auth/Backend/ApacheTest.php        |  21 ++-
 23 files changed, 524 insertions(+), 186 deletions(-)

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