[2018.3] Merge forward from 2017.7 to 2018.3 #47435
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
The private funcs aren't parsed by RST autosummary so telling someone to view them is not helpful
This fixes an UnboundLocalError when the jinja templating or yaml loading fails. It also re-adds some previously-deleted crucial documentation regarding the `search_order` option. Finally, it fixes some incorrectly-formatted RST and makes the result a example python data structure. We still need "split mode" documentation, but this was left undone with a TODO telling the user to reference a docstring that isn't visible in the docs.
pillar_ldap: Fix cryptic errors when config file fails to load
I forgot to do this in saltstack#47334, it is needed to prevent a `KeyError` in these cases.
…xc_info_with_exception Tornado5.0: Future.exc_info is dropped
Fixes saltstack#47264 This also fixes the syntax highlighting since rst needs double backticks rather than single backticks.
Return an empty dict if no search_order in ldap ext_pillar config file
Close the repo and fix multiple tests
Fix py2 version of pip test
add io_loop handling to runtests engine
Fix missing import
Older GitPython versions will not have close
Fix "of pass" typo in grains.delval docs: change to "or pass"
…schedule-utils Fix minion scheduler to return 'retcode' from executed functions
… results of the minions before publishing a payload.
…hich was written by @mattp- that was already merged into develop branch, related pr is saltstack#46692.
…tion_name_fix fixed vpc_peering_connection_name option
Fixes a bug of rest_tornado's 'local' client, complement fix of saltstack#46326
Warn on use of virtual packages in pkg.installed state
Add additional service module integration tests and enable for windows
This is what is used when getting server names quickly.
…nwarning-2017.7.2-v2 zeromq 17 deprecation warning backport from 2018.3 + tornado 5 fixes
server_list_min should use state, not status
Conflicts: - salt/daemons/flo/zero.py - salt/minion.py - salt/pillar/pillar_ldap.py - salt/transport/zeromq.py - salt/utils/async.py - salt/utils/zeromq.py - tests/integration/modules/test_service.py - tests/integration/netapi/rest_tornado/test_app.py - tests/unit/fileserver/test_gitfs.py - tests/unit/modules/test_pip.py
gtmanfred
approved these changes
May 2, 2018
added 2 commits
May 2, 2018 16:50
These were removed in a downstream PR, saltstack#47415, and are now failing again in this merge forward. I will contact the OP about addressing this in 2018.3 as these test failures are not something I have been able to track down in a merge-forward PR.
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: