Fixed file.line on Windows - fix #34665 #34666
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
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Jul 15, 2016
* upstream/develop: Fixed file.line on Windows - fix saltstack#34665 (saltstack#34666) Revert "Modify lodaer global test to use populated dunders" INI uses proper line endings - fix saltstack#34667 Spelling fixes found in sqlite3 pillar docs (saltstack#34652) Lint 34644 (saltstack#34651) Adjust the mine test a little bit to give it a better chance of success (saltstack#34647) catch error if no dns domains exist Check that mysqladmin exists before running mysql integration tests. add num_cpus grain to freebsd (saltstack#34565) Fixes failing test on Suse Leap (saltstack#34621) Changed network state test to use test=True Clarifies the proper way to reference states Some small changes handle jboss cli expression type in the parsing of the output Change network state integration test to use test=True
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.
What does this PR do?
This fixes the
file.lineon windowsWhat issues does this PR fix or reference?
Tests written?
No