Merge branch 'hotfix-0.1.9' into stable

BertrandGouny · BertrandGouny · commit 3f44f60f3f3e · 2015-11-20T10:46:32.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.1.9
+  - Upgrade baseimage: light-baseimage:0.1.5
+
 ## 0.1.8
   - Upgrade baseimage: light-baseimage:0.1.4
 
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/keepalived
-VERSION = 0.1.8
+VERSION = 0.1.9
 
 .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>
 
 # Keepalived version

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`	`# Keepalived version`