From dfd77a6822bcd81e6e6a34505861363b28a879df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@plataformatec.com.br>
Date: Sun, 8 May 2016 22:25:11 +0200
Subject: [PATCH] Release v1.1.6

---
 CHANGELOG.md | 11 +++++++++++
 mix.exs      |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 833631b16a..903e706c81 100644
--- 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
index cc19faf625..fffb9a07a7 100644
--- 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}]