Merge branch 'master' into next

This commit is contained in:
Alam Ed Arias 2016-05-31 17:57:12 -04:00
commit ef290723c2
1 changed files with 3 additions and 0 deletions

View File

@ -188,6 +188,9 @@ matrix:
osx_image: xcode7.3
#Apple LLVM version 7.3.0 (clang-703.0.31)
allow_failures:
- compiler: clang-3.5
- compiler: clang-3.6
- compiler: clang-3.7
- compiler: clang-3.8
cache: