Skip to content

Commit

Permalink
Update ntp to c1eef64
Browse files Browse the repository at this point in the history
c1eef64 Merge pull request redhat-openstack#248 from hunner/bump_deps
6ba70b0 Merge pull request redhat-openstack#247 from hunner/TelekomCloud-feature/no_ulc_by_default
da041cc Bump stdlib to 4.5.0
fff6956 No Undisciplined Local Clock by default
b214c79 Merge pull request redhat-openstack#246 from hunner/genome-vendor-fudge
ed2fa1e Add readme
5f2d844 Add fudge option
e4c2072 Merge pull request redhat-openstack#244 from hunner/debian_defaults
8dca188 Update to debian wheezy defaults
73d0214 Merge pull request redhat-openstack#243 from hunner/udlc
21a7191 Merge pull request redhat-openstack#245 from hunner/pe32
429e7c5 Fix PR redhat-openstack#235 and make udlc configurable
655d966 (MODULES-1796) Fix stdlib 3.2.0 compatibility
4acfa3b Merge pull request redhat-openstack#235 from guessi/fix_virtual_detection
f878fa0 Merge pull request redhat-openstack#238 from ccin2p3/broadcast_and_auth
05b6a27 Merge pull request redhat-openstack#242 from psoloway/readme-overhaul
ad419f0 Update the README Table of Contents
7443778 Merge pull request redhat-openstack#241 from psoloway/readme-overhaul
5b9e8a5 General stye & content overhaul
955ef51 Merge pull request redhat-openstack#240 from cmurphy/rspec
81913cb Pin rspec gems
d7a8029 fix `is_virtual` detection issue
ab5804c Pull Request redhat-openstack#238 add the two options "broadcastclient" and "disable auth"
e57ad70 Merge pull request redhat-openstack#236 from hunner/fix_233
e33e0ee These tests are better covered by the existing unit tests.
6e56c07 Merge pull request redhat-openstack#232 from jamesdobson/bug/master/invalid_logfile_parameter
3de8b3b Merge pull request redhat-openstack#234 from bastelfreak/update-readme
2be7648 extend Readme for a simple client
9f2dd0d Merge pull request redhat-openstack#233 from juniorsysadmin/package-manage-parameter
5d821a8 (MODULES-1479) Add package_manage parameter
3a4342e Fixing logfile parameter.
15bd628 Merge pull request redhat-openstack#229 from cmurphy/master
879782e Add IntelliJ files to the ignore list
d9cd2a0 Merge pull request redhat-openstack#227 from laurenrother/summary
d593de1 Merge pull request redhat-openstack#228 from cmurphy/master
68e5db9 Add json gem
ad96090 Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md
5d23441 dd metadata summary per FM-1523
00b34f3 Merge pull request redhat-openstack#226 from mhaskel/MODULES-207
7cd29cc There are no setup-requirements for puppetlabs-ntp
1e98668 Merge pull request redhat-openstack#225 from mhaskel/test
948d053 Merge remote-tracking branch 'upstream/3.3.x' into test
1f519f7 Merge pull request redhat-openstack#224 from cyberious/3.3.x
f31b195 add support for solaris given the ssl cert issue
d0fe294 Merge pull request redhat-openstack#223 from mhaskel/spec_helper_fix
0718d95 stdlib installation wasn't working
bb52d23 Merge pull request redhat-openstack#222 from mhaskel/limitations
fa30e14 Limitations was out of date.
cc1c866 Merge pull request redhat-openstack#221 from mhaskel/moar_sles12
9753f95 Updated testing and support for sles12
4fd5093 Merge pull request redhat-openstack#220 from cyberious/Sles12
252d5b3 Updated testing and support for sles12
7a20fb6 Merge pull request redhat-openstack#219 from mhaskel/3.3.0-prep
00e30e0 Merge pull request redhat-openstack#218 from mhaskel/test
ca7be1d 3.3.0 prep
5a63a51 Merge remote-tracking branch 'upstream/3.2.x' into test
177aebf Merge pull request redhat-openstack#217 from cyberious/Sles12
be63c07 Fix spec tests and update to use stdlib 3.2.x branch for spec acceptance testing
8491dd6 Add SLES12 support as it has changed to Systemd
a607bd4 Merge pull request redhat-openstack#216 from mhaskel/test
e5cd001 Merge pull request redhat-openstack#215 from mhaskel/3.2.1-prep
d55e372 Missed some EL7 platforms
dcbefaa Merge pull request redhat-openstack#214 from mhaskel/3.2.1-prep
9596d3c 3.2.1 prep
  • Loading branch information
xbezdick committed Feb 27, 2015
1 parent 40c8164 commit df8f08b
Show file tree
Hide file tree
Showing 19 changed files with 374 additions and 161 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ mod 'nssdb',
:git => 'https://github.com/rcritten/puppet-nssdb.git'

mod 'ntp',
:commit => '8f697e32bc279b36ada752273e6c788716b95315',
:commit => 'c1eef64924a51a5fb7281a4ccd0f098f0effd270',
:git => 'https://github.com/puppetlabs/puppetlabs-ntp'

mod 'openstack_extras',
Expand Down
2 changes: 2 additions & 0 deletions ntp/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ spec/fixtures/
.vagrant/
.bundle/
coverage/
.idea/
*.iml
2 changes: 1 addition & 1 deletion ntp/.travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
32 changes: 32 additions & 0 deletions ntp/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
## 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

Expand Down
22 changes: 4 additions & 18 deletions ntp/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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/)
Expand Down
16 changes: 10 additions & 6 deletions ntp/Gemfile
Original file line number Diff line number Diff line change
@@ -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']
Expand Down
Loading

0 comments on commit df8f08b

Please sign in to comment.