[Pkg-owncloud-commits] [php-sabredav] 107/220: Merge branch 'master' into sharing-take-2

[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 06d5f53786748e13839846c41cd2f94f1e659f77
Merge: c871e14 b5a6213
Author: Evert Pot <me at evertpot.com>
Date:   Tue Mar 29 22:12:56 2016 -0400

    Merge branch 'master' into sharing-take-2

 .travis.yml                      |  2 +-
 CHANGELOG.md                     | 12 ++++++++++++
 examples/sql/mysql.calendars.sql |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --cc examples/sql/mysql.calendars.sql
index 633290d,d41f110..4785b7f
--- a/examples/sql/mysql.calendars.sql
+++ b/examples/sql/mysql.calendars.sql
@@@ -15,17 -15,10 +15,17 @@@ CREATE TABLE calendarobjects 
  
  CREATE TABLE calendars (
      id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
 +    synctoken INTEGER UNSIGNED NOT NULL DEFAULT '1',
-     components VARBINARY(20)
++    components VARBINARY(21)
 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 +
 +CREATE TABLE calendarinstances (
 +    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
 +    calendarid INTEGER UNSIGNED NOT NULL,
      principaluri VARBINARY(100),
 +    access TINYINT(1) NOT NULL DEFAULT '1' COMMENT '1 = owner, 2 = read, 3 = readwrite',
      displayname VARCHAR(100),
      uri VARBINARY(200),
 -    synctoken INTEGER UNSIGNED NOT NULL DEFAULT '1',
      description TEXT,
      calendarorder INT(11) UNSIGNED NOT NULL DEFAULT '0',
      calendarcolor VARBINARY(10),

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