Release v1.1.6

elixir-ecto · May 8, 2016 · dfd77a6 · dfd77a6
1 parent c1c8e38
commit dfd77a6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.1.6
+
+### Enhancements
+
+* Also support Poison ~> 2.0
+
+### Bug fixes
+
+* Ensure optimistic_lock reads data from changes
+* Ensure BIT(1) type can be loaded as type :boolean for MYSQL
+
 ## v1.1.5
 
 ### Bug fixes

diff --git a/mix.exs b/mix.exs
@@ -1,7 +1,7 @@
 defmodule Ecto.Mixfile do
  use Mix.Project
 
- @version "1.1.5"
+ @version "1.1.6"
  @adapters [:pg, :mysql]
  @pools [:poolboy, :sojourn_timeout, :sojourn_codel]
 
@@ -41,7 +41,7 @@ defmodule Ecto.Mixfile do
  {:decimal, "~> 1.0"},
  {:postgrex, "~> 0.11.0", optional: true},
  {:mariaex, "~> 0.5.0 or ~> 0.6.0", optional: true},
- {:poison, "~> 1.0", optional: true},
+ {:poison, "~> 1.0 or ~> 2.0", optional: true},
  {:ex_doc, "~> 0.11", only: :docs},
  {:earmark, "~> 0.1", only: :docs},
  {:inch_ex, ">= 0.0.0", only: :docs}]