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.
This commit is contained in:
Joas Schilling 2014-05-28 23:31:23 +02:00
commit 480a70ccae

View file

@ -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