Skip to content

Commit eb9681c

Browse files
author
Travis Fields
committed
Merge branch '1.0.x' of git://github.com/puppetlabs/puppetlabs-powershell into 1.0.x
Conflicts: CHANGELOG.md metadata.json
2 parents d9263a1 + 449d622 commit eb9681c

File tree

3 files changed

+30
-9
lines changed

3 files changed

+30
-9
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
1-
2014-07-09 - Release 1.0.1
1+
##2014-07-15 - Supported Release 1.0.2
2+
###Summary
3+
4+
This release merely updates metadata.json so the module can be uninstalled and
5+
upgraded via the puppet module command.
6+
7+
##2014-07-09 - Release 1.0.1
8+
###Summary
9+
210
Fix issue with metadata and PE version requirement

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ Since the powershell module is a provider for `exec` it enables the same paramet
100100
##Limitations
101101

102102
* This module requires PowerShell to be installed and the `powershell.exe` to be available in the system PATH.
103+
* Only supported on Windows Server 2003 and above, and Windows 7 and 8
103104

104105
##Development
105106

metadata.json

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,38 @@
11
{
22
"name": "puppetlabs-powershell",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
4+
"author": "Puppet Labs",
45
"summary": "A PowerShell provider for puppet.",
6+
"license": "Apache-2.0",
57
"source": "[email protected]/puppetlabs/puppetlabs-powershell.git",
68
"project_page": "http://github.com/puppetlabs/puppetlabs-powershell",
7-
"author": "Puppet Labs",
8-
"license": "Apache-2.0",
9+
"issues_url": "https://[email protected]/puppetlabs/puppetlabs-powershell/issues",
910
"operatingsystem_support": [
1011
{
11-
"operatingsystem": "Windows"
12+
"operatingsystem": "Windows",
13+
"operatingsystemrelease": [
14+
"Server 2003",
15+
"Server 2003 R2",
16+
"Server 2008",
17+
"Server 2008 R2",
18+
"Server 2012",
19+
"Server 2012 R2",
20+
"7",
21+
"8"
22+
]
1223
}
1324
],
1425
"requirements": [
1526
{
16-
"name": "pe",
27+
"name": "pe",
1728
"version_requirement": ">= 3.2.0 < 3.4.0"
1829
},
1930
{
20-
"name": "puppet",
31+
"name": "puppet",
2132
"version_requirement": "3.x"
22-
2333
}
2434
],
25-
"dependencies": [ ]
35+
"dependencies": [
36+
37+
]
2638
}

0 commit comments

Comments
 (0)