Improve top file merging documentation #34505
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
This was referenced Jul 7, 2016
|
Refs #32400 |
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Jul 8, 2016
* upstream/develop: (168 commits) Pylint fix - import fnmatch documentation typo setup.py will not print each individual file Add apt key proxy support (saltstack#34407) Pylint fix for options method, authorization_type should always be NONE, otherwise CORS support will not work properly when other methods are using authorization_type AWS_IAM. Add support to reject keys Add check.event (and clean a print) update docker_events dependency reference Lower the log level for modules which cannot be loaded to trace Integration test for grains data in templatized files (saltstack#34487) Rename some unit test files by adding _test (saltstack#34503) Improve top file merging documentation (saltstack#34505) Use correct resourcegroup for network interfaces Completely remove Python and verify Errors will stop the scripts Use Python 2.7.12 for Windows Build (saltstack#34468) Use -O in wget develop example in bootstrap tutorial remove unnecessary block parsing ip addrs for nova Gracefully handle non-XML output in GlusterFS execution module. (saltstack#34492) ...
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.
Also add a recommendation to set the merging strategy to "same" when using
GitFS, and improve usefulness of the warning logged when more than one top file
is found.
Resolves #34302.