Merge 73b93db into 0873927

.tool-versions

@@ -1,2 +1,2 @@
-elixir 1.8.1-otp-21
-erlang 21.3.2
+elixir 1.8.2-otp-22
+erlang 22.0

.travis.yml

@@ -2,14 +2,18 @@ language: elixir
 elixir:
   - 1.6.6
   - 1.7.4
-  - 1.8.1
+  - 1.8.2
 otp_release:
   - 20.3
   - 21.3
+  - 22.0
 matrix:
   include:
     - elixir: 1.6.6
       otp_release: 19.3
+  exclude:
+    - elixir: 1.6.6
+      otp_release: 22.0
 before_script:
   - MIX_ENV=test mix compile --warnings-as-errors
   - travis_wait mix dialyzer --plt

test/benchee/benchmark/collect/memory_test.exs

@@ -15,7 +15,7 @@ defmodule Benchee.Collect.MemoryTest do
       # We need to have some wiggle room here because memory used varies from
       # system to system. It's consistent in an environment, but changes
       # between environments.
-      assert memory_used > 360
+      assert memory_used > 310
       assert memory_used < 400
     end