From 264b58f3efecbd8b5968276b2062a5d68b52cb17 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Sat, 5 Apr 2014 15:50:59 -0400
Subject: [PATCH] Update CHANGELOG.md

Include changelog from previous release.
---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06781835b11..f16b3d3ca69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,12 @@ Other notable changes:
 * apt module now accepts "deb" parameter to install local dpkg files
 * regex_replace filter plugin added
 * ... to be filled in from changelogs ...
+* 
+
+## 1.5.4 "Love Walks In" - April 1, 2014
+
+- Security fix for safe_eval, which further hardens the checking of the evaluation function.
+- Changing order of variable precendence for system facts, to ensure that inventory variables take precedence over any facts that may be set on a host.
 
 ## 1.5.3 "Love Walks In" - March 13, 2014