Merge branch 'android-mason' of github.com:mapbox/mapbox-gl-native into android-mason

2014-12-10 19:14:12 +11:00
parent 2db8134d20 e6c8365767
commit c38bd5e403
1 changed files with 2 additions and 0 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,6 +46,8 @@ env:
   - TERM=dumb

 before_install:
+- sudo service mysqld stop
+- sudo service postgresql stop
 - sudo ps aux
 - source ./scripts/local_mason.sh
 - source ./scripts/travis_helper.sh