Merge pull request #2280 from assimp/kimkulling-dev

Update .travis.yml

.travis.yml

@@ -33,10 +33,6 @@ env:
 
 matrix:
   include:
-    # disabled until clang 5.0 analyzer issues are fixed
-    # - os: linux
-    #   compiler: clang
-    #   env: ANALYZE=ON
     - os: linux
       compiler: clang
       env: ASAN=ON
@@ -51,7 +47,6 @@ matrix:
       env: ANALYZE=ON
     - os: linux
       compiler: gcc
-#      env: DISABLE_EXPORTERS=YES ENABLE_COVERALLS=ON
       env: ENABLE_COVERALLS=ON
     - os: linux
       compiler: gcc
@@ -79,4 +74,4 @@ addons:
     notification_email: [email protected]
     build_command_prepend: "cmake"
     build_command: "make"
-    branch_pattern: coverity_scan
+    branch_pattern: master