[Pkg-owncloud-commits] [php-sabredav] 14/16: Merge tag 'upstream/2.1.7' into 2.1

[David Prévot]

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

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

commit 825960c2eef088aa1516956232b1e99b0515fca0
Merge: babba6c ea95064
Author: David Prévot <taffit at debian.org>
Date:   Sat Sep 5 10:07:13 2015 -0400

    Merge tag 'upstream/2.1.7' into 2.1
    
    Upstream version 2.1.7
    
    # gpg: Signature made sam. 05 sept. 2015 10:07:07 AST
    # gpg:                using RSA key 058C1CF944F6BD3C
    # gpg: Good signature from "David Prévot <david at tilapin.org>"
    # gpg:                 aka "David Prévot <davidp at altern.org>"
    # gpg:                 aka "David Prévot <davidp at no-log.org>"
    # gpg:                 aka "David Prévot <taffit at debian.org>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #      Subkey fingerprint: 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 ChangeLog.md                                    |  21 +++++
 lib/DAV/Collection.php                          |   2 +-
 lib/DAV/CorePlugin.php                          |  11 ++-
 lib/DAV/Version.php                             |   2 +-
 tests/Sabre/CalDAV/GetEventsByTimerangeTest.php |  16 ++--
 tests/Sabre/DAV/HttpMoveTest.php                | 119 ++++++++++++++++++++++++
 tests/Sabre/DAV/HttpPutTest.php                 |   2 +-
 tests/Sabre/DAV/Mock/Collection.php             |  38 +++-----
 tests/Sabre/DAV/Mock/File.php                   |  24 +++--
 tests/Sabre/DAV/ServerCopyMoveTest.php          |  68 --------------
 10 files changed, 186 insertions(+), 117 deletions(-)

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