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

num_cpus and cpu_model support for IBM/S390 #55510

Merged
merged 2 commits into from Dec 24, 2019
Merged

Conversation

FerrySchuller
Copy link
Contributor

@FerrySchuller FerrySchuller commented Dec 4, 2019

Added support for IBM/S390 in core.py

What does this PR do?

Correct # CPU grains output on S390x systems

What issues does this PR fix or reference?

Previous Behavior

salt-call grains.item num_cpus --out=pprint
{u'local': {u'num_cpus': 0}}

New Behavior

salt-call grains.item num_cpus --out=pprint
{u'local': {u'num_cpus': 2}}

Tests written?

No

Commits signed with GPG?

No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

Added support for IBM/S390 in core.py
@FerrySchuller FerrySchuller requested a review from as a code owner Dec 4, 2019
@ghost ghost requested a review from twangboy Dec 4, 2019
dwoz
dwoz approved these changes Dec 24, 2019
@dwoz dwoz merged commit 899b63f into saltstack:master Dec 24, 2019
49 checks passed
@FerrySchuller FerrySchuller deleted the patch-4 branch Dec 24, 2019
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

2 participants