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.0rc1 to 2019.2 #51581

Merged
merged 44 commits into from Feb 13, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Feb 11, 2019

Merge branch '2019.2.0.rc1' into merge-2019.2.0rc1

Conflicts:

  • Gemfile
twangboy and others added 30 commits Jan 25, 2019
Roll back some changes to _compat.py
We want to throw them in now for salt master/minion startup, but by the
sodium release we'll want to put them back in `salt/__init__.py`,
because if they haven't upgraded to Python3 by that point then they
really really need to get on the ball!
Add Python2 depreciation warning
Fix issue when directory doesn't exist in LGPO module
Fixes #51369
It was getting called in the other spot, it just wasn't actually
doing anything. Here it prints the message on the cli
Avoid tracebacks when GC has nuked all objects
Move deprecation warning after logging starts up
Add missing raise statement
Use newer upstream test-kitchen
Salt Admin Salt Admin
…2.0.rc1

Fix the failing dns test on Windows
This function does not take an argument, so this causes a traceback in
the tearDown.
Fix invocation of user.list_users in test suite
s0undt3ch and others added 12 commits Feb 6, 2019
Update installer mac
Add Py2 warning, Update Icon and Graphic
Add testing path to run_script commands
Backport 51095 to 2019.2.0.rc1
Fix test_windows_platform_data grains test for Windows Server 2019
 Conflicts:
	Gemfile
@garethgreenaway garethgreenaway requested a review from saltstack/team-core Feb 11, 2019
@dwoz dwoz merged commit 82500bb into saltstack:2019.2 Feb 13, 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
@garethgreenaway garethgreenaway deleted the garethgreenaway:merge-2019.2.0rc1 branch Feb 22, 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.