Merge remote-tracking branch 'origin/stable'

Iristyle · Iristyle · commit aa0203ca2c2d · 2016-04-06T11:47:53.000-07:00
* origin/stable:
  (FM-5081) Supported Release 1.1.2
  (FM-5080) add Puppet version ranges
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+##2016-04-06 - Supported Release 1.1.2
+###Summary
+
+Small release to support Puppet version ranges.
+
 ##2015-12-08 - Supported Release 1.1.1
 ###Summary
 
diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-sqlserver",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "author": "puppetlabs",
   "summary": "The `sqlserver` module installs and manages MS SQL Server 2012 and 2014 on Windows systems.",
   "license": "PuppetLabs-Enterprise",
@@ -30,6 +30,10 @@
     {
       "name": "pe",
       "version_requirement": ">= 3.7.0 < 2015.4.0"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": ">=3.7.0 < 5.0.0"
     }
   ],
   "dependencies": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "puppetlabs-sqlserver",`
`3`		`- "version": "1.1.1",`
	`3`	`+ "version": "1.1.2",`
`4`	`4`	`"author": "puppetlabs",`
`5`	`5`	"summary": "The `sqlserver` module installs and manages MS SQL Server 2012 and 2014 on Windows systems.",
`6`	`6`	`"license": "PuppetLabs-Enterprise",`
`@@ -30,6 +30,10 @@`
`30`	`30`	`{`
`31`	`31`	`"name": "pe",`
`32`	`32`	`"version_requirement": ">= 3.7.0 < 2015.4.0"`
	`33`	`+ },`
	`34`	`+ {`
	`35`	`+ "name": "puppet",`
	`36`	`+ "version_requirement": ">=3.7.0 < 5.0.0"`
`33`	`37`	`}`
`34`	`38`	`],`
`35`	`39`	`"dependencies": [`