[2016.11] Merge forward from 2016.3 to 2016.11 #40240
Merged
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
In some cases (e.g. Ubuntu cloud-init) authorized_keys may contain quoted spaces as part of options: `no-port-forwarding,no-agent-forwarding,no-X11-forwarding,command="echo 'Please login as the user \"ubuntu\" rather than the user \"root\".';echo;sleep 10" ssh-rsa xxxxxx` which confused the split in _replace_auth_key() in modules/ssh.py.
Needed for lint
This provides a natural solution to the chicken-and-egg problem identified in the FAQ. It also changes the name of the event in the reactor example, as I think we may have stopped sending the legacy (i.e. not-namespaced) events, so the "minion_start" event in the example would be incorrect.
…mple Link to minion start reactor example from FAQ.
Update dependencies for PyOpenSSL
Back-port saltstack#40117 to 2016.3
Leave sign_pub_messages off by default.
Back-port saltstack#39179 to 2016.3
…uthorized_keys Use regular expression instead of split when replacing authorized_keys
Update release notes for 2016.3.6
Fix wrong errno in systemd.py
Conflicts: - pkg/windows/req.txt
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.
Conflicts:
Replaces #40237