Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-ntp

.gitignore

@@ -5,3 +5,5 @@ spec/fixtures/
 .vagrant/
 .bundle/
 coverage/
+.idea/
+*.iml

.sync.yml

@@ -1 +1,3 @@
 ---
+spec/spec_helper.rb:
+  unmanaged: true

.travis.yml

@@ -1,6 +1,6 @@
 ---
 language: ruby
-bundler_args: --without development
+bundler_args: --without system_tests
 script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true

CHANGELOG.md

@@ -1,6 +1,69 @@
-##2014-05-14 - Supported Release 3.1.0
+## 2015-xx-xx - Supported Release 4.0.0
+### Summary
+This release drops puppet 2.7 support and older stdlib support.
+
+#### Backwards-incompatible changes
+- UDLC (Undisciplined local clock) is now no longer enabled by default on anything (previous was enabled on non-virtual).
+- Puppet 2.7 no longer supported
+- puppetlabs-stdlib less than 4.5.0 no longer supported
+- TODO: The `keys_file` parent directory is no longer managed by puppet
+
+#### Features
+- TODO
+
+#### Bugfixes
+- TODO
+
+##2014-11-04 - Supported Release 3.3.0
+###Summary
+
+This release adds support for SLES 12.
+
+####Features
+- Added support for SLES 12
+
+##2014-10-02 - Supported Release 3.2.1
+###Summary
+
+This is a bug-fix release addressing the security concerns of setting /etc/ntp to mode 0755 recursively.
+
+####Bugfixes
+- Do not recursively set ownership/mode of /etc/ntp
+
+##2014-09-10 - Supported Release 3.2.0
+###Summary
+
+This is primarily a feature release. It adds a few new parameters to class `ntp`
+and adds support for Solaris 11.
+
+####Features
+- Add the `$interfaces` parameter to `ntp`
+- Add support for Solaris 10 and 11
+- Synchronized files with modulesync
+- Test updates
+- Add the `$iburst_enable` parameter to `ntp`
+
+####Bugfixes
+- Fixes for strict variables
+- Remove dependency on stdlib4
+
+##2014-06-06 - Release 3.1.2
+###Summary
+
+This is a supported release.  This release fixes a manifest typo.
+
+##2014-06-06 - Release 3.1.1
+###Summary
+
+This is a bugfix release to get around dependency issues in PMT 3.6.  This
+version has a dependency on puppetlabs-stdlib >= 4 so PE3.2.x is no longer
+supported.
+
+####Bugfixes
+- Remove deprecated Modulefile as it was causing duplicate dependencies with PMT.
+
+##2014-05-14 - Release 3.1.0
 ###Summary
-This is a supported release.
 
 This release adds `disable_monitor` so you can disable the monitor functionality
 of NTP, which was recently used in NTP amplification attacks.  It also adds

CONTRIBUTING.md

@@ -41,11 +41,9 @@ Checklist (and a short version for the impatient)
 
     * Pre-requisites:
 
-      - Sign the [Contributor License Agreement](https://cla.puppetlabs.com/)
-
       - Make sure you have a [GitHub account](https://github.com/join)
 
-      - [Create a ticket](http://projects.puppetlabs.com/projects/modules/issues/new), or [watch the ticket](http://projects.puppetlabs.com/projects/modules/issues) you are patching for.
+      - [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for.
 
     * Preferred method:
 
@@ -94,17 +92,7 @@ The long version
       whitespace or other "whitespace errors".  You can do this by
       running "git diff --check" on your changes before you commit.
 
-  2.  Sign the Contributor License Agreement
-
-      Before we can accept your changes, we do need a signed Puppet
-      Labs Contributor License Agreement (CLA).
-
-      You can access the CLA via the [Contributor License Agreement link](https://cla.puppetlabs.com/)
-
-      If you have any questions about the CLA, please feel free to
-      contact Puppet Labs via email at [email protected].
-
-  3.  Sending your patches
+  2.  Sending your patches
 
       To submit your changes via a GitHub pull request, we _highly_
       recommend that you have them on a topic branch, instead of
@@ -124,7 +112,7 @@ The long version
       in order to open a pull request.
 
 
-  4.  Update the related GitHub issue.
+  3.  Update the related GitHub issue.
 
       If there is a GitHub issue associated with the change you
       submitted, then you should update the ticket to include the
@@ -220,14 +208,12 @@ review.
 Additional Resources
 ====================
 
-* [Getting additional help](http://projects.puppetlabs.com/projects/puppet/wiki/Getting_Help)
+* [Getting additional help](http://puppetlabs.com/community/get-help)
 
 * [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
 
 * [Patchwork](https://patchwork.puppetlabs.com)
 
-* [Contributor License Agreement](https://projects.puppetlabs.com/contributor_licenses/sign)
-
 * [General GitHub documentation](http://help.github.com/)
 
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)

Gemfile

@@ -1,15 +1,19 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-group :development, :test do
+group :development, :unit_tests do
   gem 'rake',                    :require => false
-  gem 'rspec-puppet',            :require => false
+  gem 'rspec-core', '3.1.7',     :require => false
+  gem 'rspec-puppet', '~> 1.0',  :require => false
   gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
   gem 'puppet-lint',             :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-  gem 'pry',                     :require => false
   gem 'simplecov',               :require => false
+  gem 'puppet_facts',            :require => false
+  gem 'json',                    :require => false
+end
+
+group :system_tests do
+  gem 'beaker-rspec',  :require => false
+  gem 'serverspec',    :require => false
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']