From 9a5ab35f11aefc2cb1f22b49579f7f78cb58c223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@plataformatec.com.br>
Date: Tue, 15 Mar 2016 14:30:22 +0100
Subject: [PATCH] Release v1.1.5

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67a00cf923..833631b16a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.1.5
+
+### Bug fixes
+
+* Fix Mariaex requirement for 0.5.x and 0.6.x
+
 ## v1.1.4
 
 ### Enhancements
diff --git a/mix.exs b/mix.exs
index 12a094f110..cc19faf625 100644
--- a/mix.exs
+++ b/mix.exs
@@ -1,7 +1,7 @@
 defmodule Ecto.Mixfile do
   use Mix.Project
 
-  @version "1.1.4"
+  @version "1.1.5"
   @adapters [:pg, :mysql]
   @pools [:poolboy, :sojourn_timeout, :sojourn_codel]
 
@@ -40,7 +40,7 @@ defmodule Ecto.Mixfile do
      {:sbroker, "~> 0.7", optional: true},
      {:decimal, "~> 1.0"},
      {:postgrex, "~> 0.11.0", optional: true},
-     {:mariaex, "~> 0.5 or ~> 0.6", optional: true},
+     {:mariaex, "~> 0.5.0 or ~> 0.6.0", optional: true},
      {:poison, "~> 1.0", optional: true},
      {:ex_doc, "~> 0.11", only: :docs},
      {:earmark, "~> 0.1", only: :docs},