Merge branch 'testing'

This commit is contained in:
Markus Frosch 2017-01-02 11:32:37 +01:00
commit 7ac0983229
2 changed files with 8 additions and 2 deletions

View File

@ -20,5 +20,6 @@ env:
DIRECTOR_TESTDB_USER="director_test" DIRECTOR_TESTDB_USER="director_test"
before_script: before_script:
- composer self-update --stable
- ./test/travis-prepare.sh - ./test/travis-prepare.sh
- composer install - composer install

View File

@ -15,10 +15,15 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "icinga/icingaweb2", "name": "icinga/icingaweb2",
"version": "2.3.4", "version": "2.4.0",
"dist": { "dist": {
"url": "https://github.com/Icinga/icingaweb2/archive/v2.3.4.zip", "url": "https://github.com/Icinga/icingaweb2/archive/v2.4.0.zip",
"type": "zip" "type": "zip"
},
"source": {
"url": "https://github.com/Icinga/icingaweb2.git",
"type": "git",
"reference": "master"
} }
} }
} }