Merge branch '2.3' into 2.7

* 2.3: [travis] Add PHP 7 to allowed failures until segfaults are fixed
2015-09-03 13:42:06 +02:00 · 2015-09-03 13:42:06 +02:00 · 323178e28b
parent 05d9411670 823bce0193
commit 323178e28b
1 changed files with 5 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -14,9 +14,12 @@ matrix:
        - php: 5.4
        - php: 5.5
        - php: 5.6
-          env: deps=low
-        - php: 7.0
          env: deps=high
+        - php: 7
+        - php: 5.6
+          env: deps=low
+    allow_failures:
+        - php: 7
    fast_finish: true

 services: mongodb