[Pkg-owncloud-commits] [php-sabredav] 25/28: Merge branch '3.1' of github.com:fruux/sabre-dav into 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 ffa9e2439876b7e15e9fab36ba6ddde1cfe44fb0
Merge: b62590b 9093938
Author: Evert Pot <me at evertpot.com>
Date:   Sat Mar 12 22:35:36 2016 -0500

    Merge branch '3.1' of github.com:fruux/sabre-dav into 3.1

 CHANGELOG.md                                       |  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 +-
 9 files changed, 53 insertions(+), 51 deletions(-)

diff --cc CHANGELOG.md
index 66e5ce9,029a4fa..f238d34
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -8,9 -8,8 +8,11 @@@ ChangeLo
    deleting them.
  * #787: Cannot use non-seekable stream-wrappers with range requests.
  * Faster XML parsing and generating due to sabre/xml update.
+ * #793: The Sqlite schema is now more strict and more similar to the MySQL
+   schema. This solves a problem within Baikal.
 +* The zip release ships with [sabre/vobject 4.0.3][vobj],
 +  [sabre/http 4.2.1][http], [sabre/event 3.0.0][evnt],
 +  [sabre/uri 1.1.0][uri] and [sabre/xml 1.4.1][xml].
  
  
  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