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

salt/grains/core.py: restore bsd_cpudata grains update on FreeBSD; fi… #34771

Closed
wants to merge 1 commit into from

Conversation

junovitch
Copy link
Contributor

What does this PR do?

After addressing #29882 in de56617 the call for grains.update(_bsd_cpudata(grains)) was omitted for FreeBSD and only called on NetBSD and OpenBSD.

What issues does this PR fix or reference?

#33608

Previous Behavior

grains.update skipped

New Behavior

grains.update called

Tests written?

No. Testing by the submitter noted in the issue and patched for the FreeBSD port in freebsd/freebsd-ports@0214514. I'd like to get that in 2016.3.2 so we can remove patching the port.

…xes 33608

After addressing saltstack#29882 in de56617 the call for
grains.update(_bsd_cpudata(grains)) was omitted for FreeBSD and only
called on NetBSD and OpenBSD.
@junovitch
Copy link
Contributor Author

Looks like #34382 is the same issue.

@junovitch
Copy link
Contributor Author

I completely spaced that this was add at the bottom of the code block by another commit.

@junovitch junovitch closed this Jul 19, 2016
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.

1 participant