diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2014-07-12 04:26:02 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2014-07-12 04:26:02 +0400 |
| commit | 3dcf8c383f95211a14344899221800aa55b742f6 (patch) | |
| tree | 9846ebb264f57c05ecf434d00c9ab31a37b9d7b8 /.travis.yml | |
| parent | 730766125728453808281d61bb0740fcba591dec (diff) | |
| parent | 305f16508662713f2e1247d5a1ee7708fa656d97 (diff) | |
Merge remote-tracking branch 'origin/master' into report_and_dimension_refactoring
Conflicts:
core/Updates/0.4.2.php
core/Updates/0.6.3.php
core/Updates/1.2-rc1.php
core/Updates/1.9-b9.php
core/Version.php
tests/PHPUnit/Fixture.php
tests/PHPUnit/Fixtures/UITestFixture.php
tests/PHPUnit/Integration/Core/JsProxyTest.php
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 4eb7e54bec..25286e1e14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,8 +87,8 @@ before_script: - mysql -e "SHOW GLOBAL VARIABLES;" # Setup Piwik stack - ./tests/travis/initiate_ui_tests.sh - - composer self-update - - composer install + - travis_retry composer self-update + - travis_retry composer install - uname -a - date - php -r "var_dump(gd_info());" |