Merge branch 'hotfix-0.1.8' into stable

light-baseimage:0.1.4
[twgit] Init hotfix 'hotfix-0.1.8'.
2015-11-19 15:16:19 +01:00 · 2015-11-19 15:09:38 +01:00 · 2015-11-19 15:08:49 +01:00
3 changed files with 7 additions and 4 deletions
@@ -1,14 +1,17 @@
 # Changelog
 ## 0.1.8
  - Upgrade baseimage: light-baseimage:0.1.4
 ## 0.1.7
-  - Upgrade baseimage: osixia/light-baseimage:0.1.2
+  - Upgrade baseimage: light-baseimage:0.1.2
 ## 0.1.6
  - Better way to add custom config
  - Improve documentation
 ## 0.1.5
-  - Upgrade baseimage: osixia/light-baseimage:0.1.1
+  - Upgrade baseimage: light-baseimage:0.1.1
 ## 0.1.4
  - Use light-baseimage
@@ -1,5 +1,5 @@
 NAME = osixia/keepalived
-VERSION = 0.1.7
+VERSION = 0.1.8
 .PHONY: all build test tag_latest release
@@ -1,4 +1,4 @@
-FROM osixia/light-baseimage:0.1.2
+FROM osixia/light-baseimage:0.1.4
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 # Keepalived version
Author	SHA1	Message	Date
Bertrand Gouny	bf445ef9bf	Merge branch 'hotfix-0.1.8' into stable	2015-11-19 15:16:19 +01:00
Bertrand Gouny	c7291a3a97	light-baseimage:0.1.4	2015-11-19 15:09:38 +01:00
Bertrand Gouny	b5e8781264	[twgit] Init hotfix 'hotfix-0.1.8'.	2015-11-19 15:08:49 +01:00