From 85a4f8fb1f8f2ba8f26f4e4dc94ca3137508a894 Mon Sep 17 00:00:00 2001
From: Jeff McCune <jeff@puppetlabs.com>
Date: Tue, 24 May 2011 14:10:13 -0700
Subject: [PATCH] Update CHANGELOG for 1.0.0 release

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index e342091..6f26b1f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+2011-05-24 Jeff McCune <jeff@puppetlabs.com> - 1.0.0
+* Default to JDK version 6u25
+
 2011-05-24 Jeff McCune <jeff@puppetlabs.com> - 0.0.1
 * Initial release