[Pkg-owncloud-commits] [php-sabredav] 39/148: Merge branch 'master' into xml-rewrite2

[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 4ddb01ad6a83b9f7418b3252ca9c1f79a818a4f7
Merge: 52a42fb d199f47
Author: Evert Pot <me at evertpot.com>
Date:   Wed Feb 11 00:13:23 2015 -0500

    Merge branch 'master' into xml-rewrite2

 .travis.yml                                      |  4 +++-
 ChangeLog.md                                     |  1 +
 lib/CalDAV/Backend/AbstractBackend.php           |  2 +-
 lib/CalDAV/Backend/BackendInterface.php          | 16 ++++++++--------
 lib/DAVACL/AbstractPrincipalCollection.php       |  2 +-
 lib/DAVACL/PrincipalBackend/AbstractBackend.php  |  5 +++--
 lib/DAVACL/PrincipalBackend/BackendInterface.php |  3 ++-
 tests/Sabre/DAVACL/PrincipalCollectionTest.php   |  9 +++++++++
 8 files changed, 28 insertions(+), 14 deletions(-)

diff --cc .travis.yml
index 3be06e4,b8c58e1..0331c96
--- a/.travis.yml
+++ b/.travis.yml
@@@ -18,11 -20,9 +20,11 @@@ services
  
  sudo: false
  
 +cache: vendor
 +
  before_script:
    - mysql -e 'create database sabredav'
-   - composer self-update
+   #  - composer self-update
    - composer update --prefer-source $LOWEST_DEPS
  
  script:

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