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

Merged
merged 7 commits into from Jan 14, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented Jan 11, 2019

No conflicts

@garethgreenaway

This comment has been minimized.

Copy link
Member

commented Jan 14, 2019

@Ch3LL Couple lint errors here too.

max-arnold and others added 7 commits Dec 15, 2018
Also remove the mention of obsolete "grains" output format.
Resolves #38502.
…x to rallytime@430c462 in the proxy module.
Issue #50849.
@Ch3LL Ch3LL force-pushed the Ch3LL:merge-2019.2 branch from f2291ba to 1d7329a Jan 14, 2019
@garethgreenaway garethgreenaway merged commit 12901c3 into saltstack:2019.2 Jan 14, 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 Jan 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.