Skip to content

Commit 50fa8b7

Browse files
author
Morgan Haskel
committed
Merge pull request #118 from cyberious/ReleasePrep
FM-2347 Release Prep
2 parents b94fe56 + 3913714 commit 50fa8b7

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
##2015-04-14 - Supported Release 1.3.0
2+
###Summary
3+
Remove openssl command line tool from requirements
4+
5+
####Features
6+
- Add Windows support and tests
7+
18
##2014-11-11 - Supported Release 1.2.6
29
###Summary
310

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,4 @@ Development
127127
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.
128128

129129
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)
130-
130+

metadata.json

+15-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "puppetlabs-java_ks",
3-
"version": "1.2.6",
3+
"version": "1.3.0",
44
"author": "puppetlabs",
55
"summary": "Manage arbitrary Java keystore files",
6-
"license": "ASL 2.0",
6+
"license": "Apache-2.0",
77
"source": "https://github.com/puppetlabs/puppetlabs-java_ks.git",
88
"project_page": "https://github.com/puppetlabs/puppetlabs-java_ks",
99
"issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
@@ -76,6 +76,18 @@
7676
"6.1",
7777
"7.1"
7878
]
79+
},
80+
{
81+
"operatingsystem": "Windows",
82+
"operatingsystemrelease": [
83+
"Server 2003 R2",
84+
"Server 2008 R2",
85+
"Server 2012",
86+
"Server 2012 R2",
87+
"7",
88+
"8",
89+
"8.1"
90+
]
7991
}
8092
],
8193
"requirements": [
@@ -88,8 +100,7 @@
88100
"version_requirement": "3.x"
89101
}
90102
],
91-
"description": "Uses a combination of keytool and openssl to manage entries in a Java keystore.",
103+
"description": "Uses a combination of keytool and Ruby openssl library to manage entries in a Java keystore.",
92104
"dependencies": [
93-
94105
]
95106
}

0 commit comments

Comments
 (0)