From 6b766ad75f15ef4b7e88acbcdbcb52d86ab34d5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@plataformatec.com.br>
Date: Mon, 22 Feb 2016 12:41:53 +0100
Subject: [PATCH] Release v1.1.4

---
 CHANGELOG.md | 7 +++++++
 mix.exs      | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e99a9beeed..67a00cf923 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## v1.1.4
+
+### Enhancements
+
+* Support Mariaex 0.5.x and 0.6.x
+* Wrap each pool in a supervisor
+
 ## v1.1.3
 
 ### Enhancements
diff --git a/mix.exs b/mix.exs
index 3baa6b6a79..12a094f110 100644
--- a/mix.exs
+++ b/mix.exs
@@ -1,7 +1,7 @@
 defmodule Ecto.Mixfile do
   use Mix.Project
 
-  @version "1.1.3"
+  @version "1.1.4"
   @adapters [:pg, :mysql]
   @pools [:poolboy, :sojourn_timeout, :sojourn_codel]