[Pkg-owncloud-commits] [php-sabredav] 83/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 114d0fc2ce6bb33d976a0f46bca66357f67b8407
Merge: 6c557f4 d2de187
Author: Evert Pot <me at evertpot.com>
Date:   Mon Mar 21 14:41:03 2016 -0400

    Merge branch '3.1'

 CHANGELOG.md                                       | 28 ++++++++++--
 composer.json                                      |  2 +-
 examples/sql/sqlite.addressbooks.sql               | 22 +++++-----
 examples/sql/sqlite.calendars.sql                  | 50 +++++++++++-----------
 examples/sql/sqlite.locks.sql                      |  2 +-
 examples/sql/sqlite.principals.sql                 | 10 ++---
 examples/sql/sqlite.propertystorage.sql            |  8 ++--
 examples/sql/sqlite.users.sql                      |  6 +--
 .../DAV/PropertyStorage/Backend/PDOMysqlTest.php   |  2 +-
 .../DAV/PropertyStorage/Backend/PDOSqliteTest.php  |  2 +-
 10 files changed, 77 insertions(+), 55 deletions(-)

diff --cc CHANGELOG.md
index b00cf73,39cd896..1c6a99b
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,16 -1,13 +1,22 @@@
  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 (????-??-??)
+ 3.1.3 (????-??-??)
+ ------------------
+ 
+ * Set minimum libxml version to 2.7.0 in `composer.json`.
+ 
+ 
+ 3.1.2 (2016-03-12)
  ------------------
  
  * #784: Sync logs for address books were not correctly cleaned up after

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