From 2670c2dc8b97ba059841587db12c394d97be8237 Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bgouny@hipay.com>
Date: Thu, 19 Nov 2015 13:57:28 +0100
Subject: [PATCH 1/2] [twgit] Init hotfix 'hotfix-0.1.4'.


From 40217cc44d4269f69f3a87b45a9ff7eed53c51b3 Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bgouny@hipay.com>
Date: Thu, 19 Nov 2015 13:59:35 +0100
Subject: [PATCH 2/2] osixia/openldap:1.0.5

---
 CHANGELOG.md     | 3 +++
 Makefile         | 2 +-
 image/Dockerfile | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9eb7395..2c1dfce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.1.4
+  - Upgrade baseimage: osixia/openldap:1.0.5
+
 ## 0.1.3
   - Upgrade baseimage: osixia/openldap:1.0.4
 
diff --git a/Makefile b/Makefile
index fbb9639..29c4b3e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/openldap-backup
-VERSION = 0.1.3
+VERSION = 0.1.4
 
 .PHONY: all build test tag_latest release
 
diff --git a/image/Dockerfile b/image/Dockerfile
index f2c688c..7b438ae 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM osixia/openldap:1.0.4
+FROM osixia/openldap:1.0.5
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Use baseimage's init system.