[Pkg-owncloud-commits] [php-sabredav] 78/220: Merge branch '3.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 cae8bcd5d8f38f5da3987307b413d21e36e08f92
Merge: c0cffca a23a413
Author: Evert Pot <me at evertpot.com>
Date:   Wed Mar 9 10:05:24 2016 -0500

    Merge branch '3.1'

 CHANGELOG.md                | 23 +++++++++++++++++++++++
 lib/CardDAV/Backend/PDO.php |  2 +-
 lib/DAV/CorePlugin.php      | 10 ++++------
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --cc CHANGELOG.md
index 470b8a9,af9fa50..b00cf73
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,15 -1,14 +1,23 @@@
  ChangeLog
  =========
  
 +3.2.0-alpha1 (????-??-??)
 +-------------------------
 +
 +* Removed database migration script for sabre/dav 1.7. To update from that
 +  version you now first need to update to sabre/dav 3.1.
 +* Removed deprecated function: `Sabre\DAV\Auth\Plugin::getCurrentUser()`.
 +* #774: Fixes for getting free disk space on Windows.
 +
 +
+ 3.1.2 (????-??-??)
+ ------------------
+ 
+ * #784: Sync logs for address books were not correctly cleaned up after
+   deleting them.
+ * #787: Cannot use non-seekable stream-wrappers with range requests.
+ 
+ 
  3.1.1 (2016-01-25)
  ------------------
  

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