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

fix conflict with rpm module #3750

Merged
merged 1 commit into from
Feb 16, 2013
Merged

fix conflict with rpm module #3750

merged 1 commit into from
Feb 16, 2013

Conversation

giantlock
Copy link
Contributor

Someone thinks osrelease is mandatory grain (see rpm.virtual()).
But actually in *BSD "osrelease" is more match name for "os version" parameter, because there is no difference between kernel and os at this point.

thatch45 added a commit that referenced this pull request Feb 16, 2013
fix conflict with rpm module
@thatch45 thatch45 merged commit 5a32e5a into saltstack:develop Feb 16, 2013
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.

2 participants