Merge branch 'hotfix-0.1.4' into stable

osixia · Nov 19, 2015 · a5a5f78 · a5a5f78
2 parents 3117b51 + 40217cc
commit a5a5f78
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-FROM osixia/openldap:1.0.4
+FROM osixia/openldap:1.0.5
 MAINTAINER Bertrand Gouny <[email protected]>
 
 # Use baseimage's init system.