From ab5d9d64979dd0e2277729d8ef2d608d690bd4c5 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Mon, 6 Jan 2014 13:44:20 -0500
Subject: [PATCH] Prepare a 1.1.0 release.

---
 CHANGELOG  | 15 +++++++++++++++
 Modulefile |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 42b6a39..58366b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,18 @@
+2014-01-06 - Version 1.1.0
+
+Summary:
+
+Primarily a release for Ubuntu users!
+
+Features:
+- Add support for Ubuntu Saucy (13.10)
+- Add `java_home` parameter for centralized setting of JAVA_HOME.
+
+Bugfixes:
+- Plus signs are valid in debian/ubuntu package names.
+
+
+
 1.0.2 ()
 
 Brett Porter <brett@apache.org>
diff --git a/Modulefile b/Modulefile
index 9fa88e4..55dd1fd 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name         'puppetlabs-java'
-version      '1.0.1'
+version      '1.1.0'
 source       'git://github.com/puppetlabs/puppetlabs-java'
 author       'puppetlabs'
 license      'Apache'