Merge pull request #79 from mhaskel/1.2.5-prep

1.2.5 prep.
puppetlabs · Jul 10, 2014 · 03362c1 · 03362c1
2 parents 68fbf5c + 6553150
commit 03362c1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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",