Merge pull request #119 from mhaskel/merge_1.3.x_to_master

Merge 1.3.x to master

CHANGELOG.md

@@ -1,3 +1,10 @@
+##2015-04-14 - Supported Release 1.3.0
+###Summary
+Remove openssl command line tool from requirements
+
+####Features
+- Add Windows support and tests
+
 ##2014-11-11 - Supported Release 1.2.6
 ###Summary
 

README.md

@@ -127,4 +127,4 @@ Development
 Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad hardware, software, and deployment configurations that Puppet is intended to serve.  
 
 We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things. For more information, see our [module contribution guide.](https://docs.puppetlabs.com/forge/contributing.html)
-
+

metadata.json

@@ -1,9 +1,9 @@
 {
   "name": "puppetlabs-java_ks",
-  "version": "1.2.6",
+  "version": "1.3.0",
   "author": "puppetlabs",
   "summary": "Manage arbitrary Java keystore files",
-  "license": "ASL 2.0",
+  "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",
@@ -76,6 +76,18 @@
         "6.1",
         "7.1"
       ]
+    },
+    {
+      "operatingsystem": "Windows",
+      "operatingsystemrelease": [
+        "Server 2003 R2",
+        "Server 2008 R2",
+        "Server 2012",
+        "Server 2012 R2",
+        "7",
+        "8",
+        "8.1"
+      ]
     }
   ],
   "requirements": [
@@ -88,8 +100,7 @@
       "version_requirement": "3.x"
     }
   ],
-  "description": "Uses a combination of keytool and openssl to manage entries in a Java keystore.",
+  "description": "Uses a combination of keytool and Ruby openssl library to manage entries in a Java keystore.",
   "dependencies": [
-
   ]
 }