ntp: fixes #19418 - allow template override #47
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This allows a template to be explicitly set.
|
Thank you for this contribution! It appears that the Travis-ci tests are currently failing on this pull request. We're unable to merge pull requests with failing tests, so these need to be reviewed and resolved before we can proceed. The output from one of the failed runs is available at https://travis-ci.org/puppetlabs/puppetlabs-ntp/jobs/4994150 . For reference it seems that the issue is due to a template being actually locatable during the test, so it might be necessary to stub |
|
@adrienthebo of course. I had passing tests locally then forgot to add the fixtures/modules/my_ntp module to the changeset. Will this do? |
|
@frimik looks good, thanks for this contribution! |
adrienthebo
added a commit
that referenced
this pull request
Mar 8, 2013
ntp: fixes #19418 - allow template override
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows a template to be explicitly set.