From 3b005106158d5a892ce40ba7a7d3936e80f8deaf Mon Sep 17 00:00:00 2001
From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 2 Jun 2011 17:40:29 -0700
Subject: [PATCH] Update CHANGELOG for version 0.1.4

---
 CHANGELOG  | 3 +++
 Modulefile | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5dfc424..ff1ee5c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+2011-06-02 Jeff McCune <jeff@puppetlabs.com> - 0.1.4
+* Fix class composition ordering problems
+
 2011-05-28 Jeff McCune <jeff@puppetlabs.com> - 0.1.3
 * Remove stages
 
diff --git a/Modulefile b/Modulefile
index 65c9e62..ebec92b 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-java'
-version '0.1.3'
+version '0.1.4'
 source 'git://github.com/puppetlabs/puppetlabs-java'
 author 'puppetlabs'
 license 'Apache'