[develop] Merge forward from 2018.3 to develop #48612
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 `Fluorine`, in order to better handle line endings, the "body" variable has been changed to a list of strings. Therefore, we need to handle encoding or decoding the elements in the list, rather than using the `stringutils` functions.
…en methodologies
…re_first_line test With 'foo', the test fails with an unknown file KeyError - we need to use the "name" variable instead. Fixes the test_line_insert_ensure_before_first_line test.
Since file.line is now using "writelines()" instead of "write()", we need to handle the unittests accordingly.
/sr.* pattern should raise exception
Back-port saltstack#46291 to 2018.3
fix git.cloned doc versionadded
Fix python2 syslog returner expecting string bytes not unicode
added 3 commits
July 16, 2018 10:11
replaced meta tag
Conflicts: - tests/unit/modules/test_file.py
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: