Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2019.2] Merge forward from 2018.3 to 2019.2 #52347

Merged
merged 54 commits into from Mar 28, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented Mar 28, 2019

Conflicts:

  • salt/states/linux_acl.py
  • salt/transport/ipc.py
DmitryKuzmenko and others added 30 commits Mar 4, 2019
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.
…ries
After this version, the library started taking into account expected
failures which Jenkins treats as regular failures.
garethgreenaway and others added 24 commits Mar 22, 2019
Result of issue #52277

Any where `test.ping` still exists in the docs was left
because of the context in those docs.
approved in #52251
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.
Allow multiple instances of IPCMessageSubscriber in one process
Replaced `test.ping` with `test.version`
Update to allow for malformed CPE_NAME from some OS's
…output

[2018.3] Changes to linux_acl state.
Fix issue with default language in LGPO
Salt cloud map alt update
Conflicts:
  - salt/states/linux_acl.py
  - salt/transport/ipc.py
@Ch3LL Ch3LL merged commit 27e6cbf into saltstack:2019.2 Mar 28, 2019
10 checks passed
10 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
@Ch3LL Ch3LL deleted the Ch3LL:merge-2019.2 branch Apr 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
7 participants
You can’t perform that action at this time.