[Pkg-owncloud-commits] [php-sabredav] 23/64: Merge branch '2.1'

[David Prévot]

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

taffit pushed a commit to tag 2.2.0alpha1
in repository php-sabredav.

commit d7e0c11d4289fb3d904aeecc1861de99b196babc
Merge: 7fce5c9 68888e0
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Wed Nov 19 23:14:53 2014 -0500

    Merge branch '2.1'
    
    Conflicts:
    	ChangeLog.md
    	lib/DAV/Version.php

 ChangeLog.md                                |  9 +++++++--
 composer.json                               |  2 +-
 lib/DAV/Auth/Backend/Apache.php             |  3 +++
 tests/Sabre/DAV/Auth/Backend/ApacheTest.php | 21 +++++++++++++++++++--
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --cc ChangeLog.md
index 1600ea1,e4e7d1c..6e06493
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,29 -1,8 +1,30 @@@
  ChangeLog
  =========
  
 +2.2.0-alpha1 (????-??-??)
 +-------------------------
 +
 +* Removed: all `$tableName` arguments from every PDO backend. This was already
 +  deprecated, but has now been fully removed. All of these have been replaced
 +  with public properties.
 +* Deleted several classes that were already deprecated much earlier:
 +  * `Sabre\CalDAV\CalendarRootNode`
 +  * `Sabre\CalDAV\UserCalendars`
 +  * `Sabre\DAV\Exception\FileNotFound`
 +  * `Sabre\DAV\Locks\Backend\FS`
 +  * `Sabre\DAV\PartialUpdate\IFile`
 +  * `Sabre\DAV\URLUtil`
 +* Removed: `Sabre\DAV\Client::addTrustedCertificates` and
 +  `Sabre\DAV\Client::setVerifyPeer`.
 +* Removed: `Sabre\DAV\Plugin::getPlugin()` can now no longer return plugins
 +  based on its class name.
 +* Removed: `Sabre\DAVACL\Plugin::getPrincipalByEmail()`.
 +* #560: GuessContentType plugin will now set content-type to
 +  `application/octet-stream` if a better content-type could not be determined.
 +
- 2.1.0-beta1 (2014-??-??)
- ------------------------
++
+ 2.1.0 (2014-??-??)
+ ------------------
  
  * #541: CalDAV PDO backend didn't respect overridden PDO table names.
  * #550: Scheduling invites are no longer delivered into shared calendars.

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