Back-port #33302 to 2015.8 #33306
Merged
Back-port #33302 to 2015.8 #33306
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As also noted in saltstack#33266, sometimes `dmidecode` will output additional commentary text in strings: ``` root@n01:~# dmidecode -s system-manufacturer # SMBIOS implementations newer than version 2.8 are not # fully supported by this version of dmidecode. Supermicro ``` This PR filters those out.
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
May 18, 2016
* upstream/develop: (23 commits) Don't merge-forward the change to salt/scripts.py Cleanup comments in smbios.get output (fixes saltstack#33266) (saltstack#33306) Back-port saltstack#32993 to 2016.3 (saltstack#33304) Fix iptables --match-set (saltstack#23643) (saltstack#33314) Improve package verification documentation Accept verify_options and ignore_types as a comma-separated list Fix minion start retry on Windows (2016.3) (saltstack#33285) update 2015.8.9 release notes (saltstack#33310) Added some more docs for master and minion config settings (saltstack#33292) linux_acl: Allow '-' as a separation character in ACL permissions. Fixes saltstack#31270 (saltstack#33172) (saltstack#33305) Server Density agentv2 support (saltstack#32772) (saltstack#33303) man pages updated (saltstack#33307) Fix iptables --match-set (saltstack#23643) (saltstack#33301) Handle more ipv6 error as an exception saltstack#33299 (saltstack#33300) Ignore retcode when checking service's status (saltstack#33294) fix "loose" typo (saltstack#33290) Fix minion start retry on Windows Add auth_tries config option to minion.rst docs (saltstack#33287) Document new master and minion config opts for 2016.3.0 Document minion_id_caching config value (saltstack#33282) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Back-port #33302 to 2015.8