Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test #143

Merged
merged 4 commits into from Mar 21, 2014
Merged

Test #143

merged 4 commits into from Mar 21, 2014

Conversation

apenney
Copy link
Contributor

@apenney apenney commented Mar 21, 2014

Backport various commits off master for a 3.0.4.

Ashley Penney and others added 4 commits March 21, 2014 22:47
This attempts to handle the fact that NTP seems to explode if IPv6
is disabled on AIX, ntp becomes unable to parse the -6 lines that
we rely on in $restrict.  It also apparently predates the KoD filtering
capabilities.  As this stands for 'Kiss of Death' we certainly want to
retain this filtering capability for other distributions and operating
systems.
Removes unnecessary apostrophes in template file introduced in 52ff81b
@puppetlabs-jenkins
Copy link
Collaborator

🔴 Test failed.
Refer to this link for build results: http://jenkins-modules.delivery.puppetlabs.net/job/puppetlabs-grizzly%20pull%20requests/10/

apenney pushed a commit that referenced this pull request Mar 21, 2014
@apenney apenney merged commit 0766175 into puppetlabs:3.0.x Mar 21, 2014
@apenney apenney deleted the test branch March 21, 2014 23:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants