Merge branch '1.0.x' of git://github.com/puppetlabs/puppetlabs-powers…

…hell into 1.0.x

Conflicts:
	CHANGELOG.md
	metadata.json

CHANGELOG.md

@@ -1,2 +1,10 @@
-2014-07-09 - Release 1.0.1 
+##2014-07-15 - Supported Release 1.0.2
+###Summary
+
+This release merely updates metadata.json so the module can be uninstalled and
+upgraded via the puppet module command.
+
+##2014-07-09 - Release 1.0.1 
+###Summary
+
 Fix issue with metadata and PE version requirement

README.md

@@ -100,6 +100,7 @@ Since the powershell module is a provider for `exec` it enables the same paramet
 ##Limitations
 
  * This module requires PowerShell to be installed and the `powershell.exe` to be available in the system PATH.
+ * Only supported on Windows Server 2003 and above, and Windows 7 and 8
 
 ##Development
 

metadata.json

@@ -1,26 +1,38 @@
 {
   "name": "puppetlabs-powershell",
-  "version": "1.0.1",
+  "version": "1.0.2",
+  "author": "Puppet Labs",
   "summary": "A PowerShell provider for puppet.",
+  "license": "Apache-2.0",
   "source": "git@github.com/puppetlabs/puppetlabs-powershell.git",
   "project_page": "http://github.com/puppetlabs/puppetlabs-powershell",
-  "author": "Puppet Labs",
-  "license": "Apache-2.0",
+  "issues_url": "https://git@github.com/puppetlabs/puppetlabs-powershell/issues",
   "operatingsystem_support": [
     {
-      "operatingsystem": "Windows"
+      "operatingsystem": "Windows",
+      "operatingsystemrelease": [
+        "Server 2003",
+        "Server 2003 R2",
+        "Server 2008",
+        "Server 2008 R2",
+        "Server 2012",
+        "Server 2012 R2",
+        "7",
+        "8"
+      ]
     }
   ],
   "requirements": [
     {
-	  "name": 		"pe",
+      "name": "pe",
       "version_requirement": ">= 3.2.0 < 3.4.0"
     },
     {
-      "name": 		"puppet",
+      "name": "puppet",
       "version_requirement": "3.x"
-
     }
   ],
-  "dependencies": [ ]
+  "dependencies": [
+
+  ]
 }