Merge forward 2019.3 to develop #52571
Closed
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
… values are empty.
…us test state functions as they are valid arguments for mod_watch.
…ecause test=True, but could be changed by other states.
The integer was causing the .replace('_', '-') function to fail
…missions are shown and not the octal number.
https://gist.github.com/s0undt3ch/9298a69a3492404d89a832de9efb1e68 This only happens when XML reporting is enabled. Why only now, I have no clue.
This is also removing the use of dev_*.ps1 scripts in the windows builds
Use windows state to bootstrap windows builds
…h.search_by when used in pillar broke when targetting the minion that was also the salt master. This was caused by the id in __opts__ being used in all cases. This change updates the glob_match function to use the preserved minion_id of the master if it is available so that targeting works as expected.
… an individual item
Make the domain grain match the windowsdomain grain on Windows
…result_comment_changes_valid_arguments [2019.2] Fix to test state functions to allow arguments that mod_watch uses
…ncludes Allow `/` in pillar includes
Virt whitespace fix
…earch_by_master [2019.2] Fixes to matchers when used in pillar
…nd_gate_unicode_string_literal_support [2019.2] Support for old yaml render
virt.pool_running: fix pool start
Add missing symlink test
fix missing client_args in influxdb module
…r-return-error 51879 fix binary pillar return error
Bring saltstack#52191 into 2019.2 branch
Add TLS support up to TLS 1.2
This reverts commit 37aeba3.
This reverts commit 684bf58.
…e process" This reverts commit 710ab50.
DmitryKuzmenko
force-pushed
the
bugs/revert_51963_develop
branch
from
71195f4
to
6ad47f1
Compare
twangboy
approved these changes
Apr 17, 2019
DmitryKuzmenko
force-pushed
the
bugs/revert_51963_develop
branch
from
6ad47f1
to
96d4e7f
Compare
This was referenced Apr 19, 2019
|
This one is outdated and it's easier to create a new one that rebase this one. |
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?
Here's Merge forward from 2019.3 + #52564 to develop branch.
What issues does this PR fix or reference?
Merge forward!