Merge pull request #287 from bmjen/mergeback

4.1.x Mergeback to master

Author: Morgan Haskel

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 2015-07-21 - Supported Release 4.1.0
+### Summary
+This release updates metadata to support new version of puppet enterprise, as well as new features, bugfixes, and test improvements.
+
+#### Features
+- Adds Solaris 10 support
+- Adds Fedora 20, 21, 22 compatibility
+
+#### Bugfixes
+- Fix default configuration for Debian (MODULES-2087)
+- Fix to ensure log file is created before service starts
+- Fixes SLES params for SLES 10, 11, 12
+
 ## 2015-05-26 - Supported Release 4.0.0
 ### Summary
 This release drops puppet 2.7 support and older stdlib support. It also includes the addition of 12 new properties, as well as numerous bug fixes and other improvements.

README.markdown

@@ -315,7 +315,7 @@ Specifies the stratum the server should operate at when using the undisciplined
 
 ##Limitations
 
-This module has been tested on [all PE-supported platforms](https://forge.puppetlabs.com/supported#compat-matrix), and no issues have been identified. Additionally, it is tested (but not supported) on Solaris 10 and 12 and Fedora 20-22.
+This module has been tested on [all PE-supported platforms](https://forge.puppetlabs.com/supported#compat-matrix), and no issues have been identified. Additionally, it is tested (but not supported) on Solaris 10 and Fedora 20-22.
 
 ##Development
 

manifests/params.pp

@@ -237,7 +237,7 @@
           '127.0.0.1',
         ]
       } else {
-        # Solaris 11, 12 ...
+        # Solaris 11...
         $package_name = [ 'service/network/ntp' ]
         $restrict     = [
           'default kod nomodify notrap nopeer noquery',

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-ntp",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "author": "Puppet Labs",
   "summary": "Installs, configures, and manages the NTP service.",
   "license": "Apache Version 2.0",
@@ -74,9 +74,7 @@
     {
       "operatingsystem": "Solaris",
       "operatingsystemrelease": [
-        "10",
-        "11",
-        "12"
+        "11"
       ]
     },
     {
@@ -91,11 +89,11 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": ">= 3.7.0 < 4.0.0"
+      "version_requirement": ">= 3.7.0 < 2015.3.0"
     },
     {
       "name": "puppet",
-      "version_requirement": "3.x"
+      "version_requirement": ">= 3.0.0 < 5.0.0"
     }
   ],
   "description": "NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux and Gentoo.",