Avoid collision between OS and OS family name #437
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
|
Closing and reopening to resolve Travis/bundler issues, this is caused due to https://tickets.puppetlabs.com/browse/MODULES-6339. |
|
Hey @jonhattan if you were able to resolve this conflict I will get this change merged for you. |
jonhattan
force-pushed
the
denote-os-family
branch
from
de7c3aa to
db0ddd8
Compare
|
@pmcmaw done! |
|
@jonhattan Fantastic! |
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.
The hiera hierarchy implies a collision when OS name and family are the same (Ex: Debian family). Here's a proposal for fix.