From 5fb60ce901fb020d41d26c75a8b1a11c8384f1ab Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 18 Feb 2014 12:31:48 +0000
Subject: [PATCH] Update changes log

---
 ChangeLog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f9ab2cf..3d62caf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
-Version 2014.xx.xx:
+Version 2014.02.18:
 	* Debian based distribution now get a warning stating that NOT starting daemons does not work 
 	as supposed, mainly because that's the Debian policy.
-
+	* Fix bug introduced when implementing the master ip flag. The default minion includes 
+	directory is `minion.d`, not `minion.conf.d`
 
 Version 2014.02.16:
 	* The script now allows setting up the salt-master address as a separate configuration file by