[2016.3] Merge forward from 2015.8 to 2016.3 #35606
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
* Add warning about AWS flagging of nmap usage Also improve the verification examples overall, and add a note about the fingerprint display difference beginning in OpenSSH 6.8. * Remove "as root" For some reason, when I was running the test in the example, I wasn't getting the script output for the host key, unless I ran as root. Don't know why this was the case but I can't reproduce it now. Removing this as it is not accurate. Also added a port number to the example as well since it speeds up the nmap command.
* Update docstring to reflect optional context argument It used to not be optional. * Update linux_sysctl tests to reflect new context key This key was changed in 5b12f03, this updates the tests to reflect the change.
No conflicts.
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.
No conflicts.