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

Only remove the word linux from distroname when its not part of the name #30897

Merged
merged 1 commit into from Feb 4, 2016
Merged

Only remove the word linux from distroname when its not part of the name #30897

merged 1 commit into from Feb 4, 2016

Conversation

mtorromeo
Copy link
Contributor

This will now still replace "CentOS Linux" with "CentOS" while leaving "CloudLinux" unmodified.
Fixes #28951

Please also backport this to 2015.5 which is the actual stable version on CloudLinux.

Thanks

This will now still replace "CentOS Linux" with "CentOS" while leaving "CloudLinux" unmodified.
Fixes #28951
cachedout pushed a commit that referenced this pull request Feb 4, 2016
Only remove the word linux from distroname when its not part of the name
@cachedout cachedout merged commit e3c2487 into saltstack:develop Feb 4, 2016
@cachedout cachedout added the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label Feb 4, 2016
@cachedout
Copy link
Contributor

Thanks, @mtorromeo

I've marked this for backporting as well.

@rallytime rallytime added ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. and removed bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch labels Feb 5, 2016
cachedout pushed a commit that referenced this pull request Feb 5, 2016
@mtorromeo mtorromeo deleted the cloudlinux-grains-fix branch September 25, 2017 09:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants