Merge pull request #1694 from Ana06/fix-sql2

Update mariadb to 10.2 to solve Travis failures
2026-08-13 19:54:02 +00:00 · 2017-09-12 15:29:43 +02:00 · 2017-09-12 15:29:43 +02:00 · cb20dca10a
commit cb20dca10a
parent b4d376e7be 9f8836732d
2 changed files with 2 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -8,7 +8,7 @@ before_install:
  - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
  - "echo `phantomjs -v`"
 addons:
-  mariadb: '10.1'
+  mariadb: '10.2'
 notifications:
  email:
    on_success: change
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -287,7 +287,7 @@ GEM
    multi_json (1.12.1)
    multi_xml (0.5.5)
    multipart-post (2.0.0)
-    mysql2 (0.4.2)
+    mysql2 (0.4.9)
    nenv (0.3.0)
    netrc (0.11.0)
    nokogiri (1.8.0)