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 2019.2.0.rc1 to 2019.2 #51678

Merged
merged 15 commits into from Feb 17, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented Feb 15, 2019

Conflicts:

  • tests/integration/init.py

This might conflict once the merge forward from 2018.3>2019.2 is merged. If so i'll re-do this one if needed.

twangboy and others added 14 commits Feb 6, 2019
Fix ssh for Windows (2019.2.0.rc1)
Convert data to string using salt util (2019.2.0.rc1)
Handle explicit lists properly
[2019.2.0.rc1] Wait for minions to be pingable before starting tests
Use makedirs instead of mkdir
Conflicts:
  - tests/integration/__init__.py
@garethgreenaway garethgreenaway requested a review from saltstack/team-core Feb 16, 2019
@s0undt3ch s0undt3ch merged commit 5f9764a into saltstack:2019.2 Feb 17, 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.