From 65531506d2c208dbaf8f4f6facb9eccb417129e8 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 9 Jul 2014 20:08:43 -0400
Subject: [PATCH] 1.2.5 prep.

---
 CHANGELOG.md  | 16 ++++++++++++++++
 Modulefile    |  2 +-
 metadata.json |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3142061..eac3b9f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+##2014-07-10 - Supported Release 1.2.5
+###Summary
+
+This release has bugfixes and test improvements.
+
+####Features
+- Update tests to use RSpec 2.99 syntax
+
+####Bugfixes
+- Remove broken support for puppet:// files.
+- Remove incorrect statment of windows support from metadata.json.
+- Fix path issue for openssl on solaris 11.
+
+####Known Bugs
+* No known bugs
+
 ##2014-06-04 - Release 1.2.4
 ###Summary
 
diff --git a/Modulefile b/Modulefile
index 3bca91f7..98b35e49 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name 'puppetlabs-java_ks'
-version '1.2.4'
+version '1.2.5'
 
 author 'puppetlabs'
 license 'ASL 2.0'
diff --git a/metadata.json b/metadata.json
index 74138113..900b47fd 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "puppetlabs-java_ks",
-    "version": "1.2.4",
+    "version": "1.2.5",
     "source": "https://github.com/puppetlabs/puppetlabs-java_ks",
     "author": "Puppet Labs",
     "license": "Apache-2.0",