diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-28 23:31:23 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-28 23:31:23 +0200 |
| commit | 480a70ccaef2a99d8cf69cf24abb8d69bf3464d2 (patch) | |
| tree | 89e7cbed5f9c4203f55f3a9f67c1292e7835a839 | |
| parent | 95ebe2dcbf9ab8d1264e0cdc1df7368051cacdf4 (diff) | |
| parent | 1b2238a6b11ff7ad8f8feae44816268c790f809d (diff) | |
| download | forums-480a70ccaef2a99d8cf69cf24abb8d69bf3464d2.tar forums-480a70ccaef2a99d8cf69cf24abb8d69bf3464d2.tar.gz forums-480a70ccaef2a99d8cf69cf24abb8d69bf3464d2.tar.bz2 forums-480a70ccaef2a99d8cf69cf24abb8d69bf3464d2.tar.xz forums-480a70ccaef2a99d8cf69cf24abb8d69bf3464d2.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12384] Use mysqli on hhvm in ascraeus. Keep explicit matrix though.
[ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 48baceb21a..fe91fe78c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: - php: 5.6 env: DB=mysqli - php: hhvm - env: DB=mysql + env: DB=mysqli allow_failures: - php: hhvm fast_finish: true |