Merge branch 'upstream-master' into feature/chromecast_wifi_scan

jhart-r7 · jhart-r7 · commit 8edac51a5898 · 2016-12-24T12:18:53.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
+dist: trusty
 sudo: false
 group: stable
 bundler_args: --without coverage development pcap
 cache: bundler
 addons:
-  postgresql: '9.3'
+  postgresql: '9.6'
   apt:
     packages:
       - libpcap-dev
