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 #51674

Merged
merged 140 commits into from Feb 20, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented Feb 15, 2019

Conflicts:

  • pkg/windows/build_env_2.ps1
  • pkg/windows/build_env_3.ps1
  • pkg/windows/req.txt
  • pkg/windows/req_win.txt
  • salt/grains/core.py

ping @s0undt3ch i decided to keep all the changes from 2019.2 instead of 2018.3 for the pkg/windows/* files, because it looked like it was intentional as you created a PR for each branch for the updates. Let me know if this is wrong and i can handle the merge-conflicts again.

nullify005 and others added 30 commits Jan 15, 2019
menglong.zhou
[2017.7] Allow running runtests.py using tox
We need to handle python_version filters in requirement files in order
to install cleanly using pip
…globals

Document the client-defined dunders
Use gems.github.com no longer exists, use gemcutter.org
Add testing path to run_script commands
dwoz and others added 12 commits Feb 14, 2019
[2018.3] increase batch test timeout on windows
[2018.3]  Increase minion wait for slow boxes
…disable_break_save

[2018.3] Fixing schedule when enabled/disabled and saved
Properly create the value for a "True" boolean element item
Conflicts:
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - pkg/windows/req_win.txt
  - salt/grains/core.py
@Ch3LL Ch3LL requested a review from s0undt3ch Feb 15, 2019
@Ch3LL Ch3LL requested a review from saltstack/team-core as a code owner Feb 15, 2019
Copy link
Member

left a comment

You did right!

@dwoz
dwoz approved these changes Feb 15, 2019
This reverts commit 191235d.
@Ch3LL Ch3LL force-pushed the Ch3LL:merge-2019.2 branch from e31bba0 to 6292f86 Feb 19, 2019
Ch3LL and others added 3 commits Feb 19, 2019
@dwoz dwoz force-pushed the Ch3LL:merge-2019.2 branch from 2030484 to 043efa0 Feb 19, 2019
dwoz and others added 2 commits Feb 20, 2019
@Ch3LL

This comment has been minimized.

Copy link
Contributor Author

commented Feb 20, 2019

@dwoz i removed that skipif. The test should be able to run on non solaris platforms. The test was failing because in 2019.2 the return was changed here 69ab0b8 from Package already installed to {} and these new tests where originally written for the 2018.3 branch

@dwoz dwoz merged commit 82cbd98 into saltstack:2019.2 Feb 20, 2019
9 checks passed
9 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
@Ch3LL Ch3LL deleted the Ch3LL:merge-2019.2 branch Mar 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
You can’t perform that action at this time.