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.

Sign up for GitHub

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

Jump to bottom

add num_cpus grain to freebsd #34565

Merged
merged 2 commits into from
Jul 13, 2016
Merged

add num_cpus grain to freebsd #34565

merged 2 commits into from
Jul 13, 2016

Conversation

Ch3LL
Copy link
Contributor

@Ch3LL Ch3LL commented Jul 8, 2016 •
edited by meggiebot
Loading

What does this PR do?

Adds the num_cpus grain to freebsd which was removed in commit: de56617

What issues does this PR fix or reference?

#34382 and #34554

Previous Behavior

root@ch3ll-freebsd10-2:~ # salt-call --local grains.item num_cpus
local:
    ----------
    num_cpus:

New Behavior

root@ch3ll-freebsd10-2:~ # salt-call --local grains.item num_cpus
local:
    ----------
    num_cpus:
        2

Tests written?

Yes

@cachedout
Copy link
Contributor

Some lint, please: https://jenkins.saltstack.com/job/PR/job/salt-pr-lint-n/3191/violations/file/tests/integration/modules/grains.py/

@cachedout cachedout added the Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged label Jul 11, 2016
@andygrunwald
Copy link
Contributor

@Ch3LL Can i support you here?

@rallytime rallytime merged commit f6dfbac into saltstack:2016.3 Jul 13, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Jul 15, 2016
@jojohans
Merge remote-tracking branch 'upstream/develop' into develop
1260f2b 
* upstream/develop:
  Fixed file.line on Windows - fix saltstack#34665 (saltstack#34666)
  Revert "Modify lodaer global test to use populated dunders"
  INI uses proper line endings - fix saltstack#34667
  Spelling fixes found in sqlite3 pillar docs (saltstack#34652)
  Lint 34644 (saltstack#34651)
  Adjust the mine test a little bit to give it a better chance of success (saltstack#34647)
  catch error if no dns domains exist
  Check that mysqladmin exists before running mysql integration tests.
  add num_cpus grain to freebsd (saltstack#34565)
  Fixes failing test on Suse Leap (saltstack#34621)
  Changed network state test to use test=True
  Clarifies the proper way to reference states
  Some small changes
  handle jboss cli expression type in the parsing of the output
  Change network state integration test to use test=True
@rallytime rallytime mentioned this pull request Jul 19, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Ch3LL @cachedout @andygrunwald @rallytime