Merge pull request #139 from puppetlabs/1.4.x

1.4.x mergeback

Author: Helen

CHANGELOG.md

@@ -1,3 +1,18 @@
+##Supported Release 1.4.0
+###Summary
+This release contains a new option to provide destkeypass. Also contains 
+bugfixes and a metadata update to support Puppet Enterprise 2015.3.x.
+
+####Features
+- Adds `destkeypass` option to pass in password when importing into the keystore.
+- Adds feature support for JCEKS format and extensions.
+
+####Bugfixes
+- Fixes composite title patterns in provider to improve support for Windows.
+
+####Test Improvements
+- Improves Windows testing.
+
 ##2015-07-20 - Supported Release 1.3.1
 ###Summary
 This release updates the metadata for the upcoming release of PE as well as an additional bugfix.

metadata.json

@@ -1,12 +1,16 @@
 {
   "name": "puppetlabs-java_ks",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "author": "puppetlabs",
   "summary": "Manage arbitrary Java keystore files",
   "license": "Apache-2.0",
   "source": "https://github.com/puppetlabs/puppetlabs-java_ks.git",
   "project_page": "https://github.com/puppetlabs/puppetlabs-java_ks",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "dependencies": [
+  
+  ],
+  "data_provider": null,
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
@@ -93,15 +97,12 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": ">= 3.0.0 < 2015.3.0"
+      "version_requirement": ">= 3.0.0 < 2015.4.0"
     },
     {
       "name": "puppet",
       "version_requirement": ">= 3.0.0 < 5.0.0"
     }
   ],
-  "description": "Uses a combination of keytool and Ruby openssl library to manage entries in a Java keystore.",
-  "dependencies": [
-  
-  ]
+  "description": "Uses a combination of keytool and Ruby openssl library to manage entries in a Java keystore."
 }