Merge branch 'hotfix-1.0.6' into stable

BertrandGouny · BertrandGouny · commit 49cdb5d19684 · 2015-11-20T12:11:27.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.0.6
+  - Use light-baseimage:0.1.5
+
 ## 1.0.5
   - Use light-baseimage:0.1.4
   - Fix replication bug when the hostname was changed
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/openldap
-VERSION = 1.0.5
+VERSION = 1.0.6
 
 .PHONY: all build test tag_latest release
 
diff --git a/image/Dockerfile b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM osixia/light-baseimage:0.1.4
+FROM osixia/light-baseimage:0.1.5
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Use baseimage's init system.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM osixia/light-baseimage:0.1.4`
	`1`	`+FROM osixia/light-baseimage:0.1.5`
`2`	`2`	`MAINTAINER Bertrand Gouny <[email protected]>`
`3`	`3`
`4`	`4`	`# Use baseimage's init system.`