Merge pull request puppetlabs#107 from glennsarti/ticket/fm-5241-release-2.0.1

ferventcoder · ferventcoder · commit e354bae43f42 · 2016-05-24T00:22:36.000-05:00
(FM-5241) Release Powershell 2.0.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+##2015-05-24 - Supported Release 2.0.1
+###Bug Fixes
+
+- Updated the powershell manager in this module in order to not conflict with the Powershell Manager in the Puppet DSC module
+
 ##2015-05-17 - Supported Release 2.0.0
 ###Summary
 
diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-powershell",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "author": "Puppet Inc",
   "summary": "Adds a new exec provider for executing PowerShell commands.",
   "license": "Apache-2.0",
@@ -16,7 +16,8 @@
         "Server 2012",
         "Server 2012 R2",
         "7",
-        "8"
+        "8",
+        "10"
       ]
     }
   ],

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "puppetlabs-powershell",`
`3`		`- "version": "2.0.0",`
	`3`	`+ "version": "2.0.1",`
`4`	`4`	`"author": "Puppet Inc",`
`5`	`5`	`"summary": "Adds a new exec provider for executing PowerShell commands.",`
`6`	`6`	`"license": "Apache-2.0",`
`@@ -16,7 +16,8 @@`
`16`	`16`	`"Server 2012",`
`17`	`17`	`"Server 2012 R2",`
`18`	`18`	`"7",`
`19`		`- "8"`
	`19`	`+ "8",`
	`20`	`+ "10"`
`20`	`21`	`]`
`21`	`22`	`}`
`22`	`23`	`],`