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

[2018.3] Merge forward from 2017.7 to 2018.3 #50570

Merged
merged 11 commits into from Nov 19, 2018

Conversation

Projects
None yet
5 participants
@garethgreenaway
Copy link
Member

commented Nov 19, 2018

Conflicts:

  • states/etcd_mod.py
  • utils/gitfs.py

terminalmage and others added some commits Nov 13, 2018

Disable custom sphinx automodule
This causes a warning and doesn't provide a tangible benefit since we
have CLI examples for functions.
Merge pull request #50500 from terminalmage/2017.7-docs
Set jenkins docs job to treat any warnings as errors
Brett Benassi
Merge pull request #50532 from dubb-b/2017.7
Adding tag to ec2 cloud tests
Merge pull request #50520 from dwoz/issue_50459
Always set .gitconfig dir to user's home

@garethgreenaway garethgreenaway requested review from terminalmage, dwoz and Ch3LL and removed request for terminalmage and dwoz Nov 19, 2018

@Ch3LL

Ch3LL approved these changes Nov 19, 2018

@dwoz

This comment has been minimized.

Copy link
Contributor

commented Nov 19, 2018

@garethgreenaway Looks like there is a linter warning.

@terminalmage terminalmage merged commit 12e0d80 into saltstack:2018.3 Nov 19, 2018

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 The lint job 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
You can’t perform that action at this time.