[develop] Merge forward from 2019.2 to develop #52398
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
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
This reverts commit dce4ffa.
After this version, the library started taking into account expected failures which Jenkins treats as regular failures.
Added in an explaination of the --zone flag
… the version function.
[2018.3] Merge forward from 2017.7 to 2018.3
…guration options. This is a result of @Ch3LL suggestion on the PR itself for this doc change.
…_subscriber Allow multiple instances of IPCMessageSubscriber in one process
…th-version Replaced `test.ping` with `test.version`
Update to allow for malformed CPE_NAME from some OS's
…_present_output [2018.3] Changes to linux_acl state.
Fix issue with default language in LGPO
…alt-update Salt cloud map alt update
Conflicts: - salt/states/linux_acl.py - salt/transport/ipc.py
[2019.2] Merge forward from 2018.3 to 2019.2
Conflicts: - doc/topics/tutorials/cloud_controller.rst - salt/states/linux_acl.py - salt/transport/ipc.py - tests/unit/states/test_linux_acl.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: