From 4d75106fa0387b1ee2508e94d79230625a3726b0 Mon Sep 17 00:00:00 2001
From: Frank Caviggia <fcaviggia@users.noreply.github.com>
Date: Fri, 19 Dec 2014 22:20:03 -0500
Subject: [PATCH] Update CHANGELOG

Updated for 1.8 release
---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1882f4d..26bdf00 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -52,3 +52,6 @@
 * Sun Oct 12 2014 - fcaviggi (at) redhat.com
 - Various fixes to scripts (password length cat2/GEN000580.sh)
 - Fixed typo in etc/krb5.conf file
+* Fri Dec 19 2014 - fcaviggi (at) redhat.com
+- Merged SCAP Security Guide (SSG) Scripts - Thanks to Shawn Wells
+- Updated directory structure for hardening scripts