[Pkg-owncloud-commits] [php-sabredav] 20/45: Merge branch '2.0' into 2.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 f0c1368545826624e0a041c2b584904308d5a399
Merge: 33b602b 5fd12cb
Author: Evert Pot <me at evertpot.com>
Date:   Thu Dec 18 18:21:22 2014 -0500

    Merge branch '2.0' into 2.1
    
    Conflicts:
    	.travis.yml

 .travis.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --cc .travis.yml
index b8d8f71,226580e..615131d
--- a/.travis.yml
+++ b/.travis.yml
@@@ -11,15 -16,14 +16,15 @@@ env
  services:
    - mysql
  
+ 
  before_script:
    - mysql -e 'create database sabredav'
- #  - composer self-update
-   - composer install --prefer-source
- #  - echo "zend.enable_gc=0" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+   - composer self-update
+   - composer update --prefer-source $LOWEST_DEPS
  
  script:
-   - ./bin/phpunit --configuration tests/phpunit.xml
+   - ./bin/phpunit --configuration tests/phpunit.xml $TEST_DEPS
 +  - ./bin/phpcs  -p --standard=tests/phpcs/ruleset.xml lib/
  
  notifications:
    irc:

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