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

Merged
merged 13 commits into from Nov 14, 2018

Conversation

Projects
None yet
5 participants
@Ch3LL
Copy link
Contributor

commented Nov 14, 2018

Conflicts:

  • doc/topics/tutorials/salt_bootstrap.rst
  • tests/integration/cloud/clouds/test_digitalocean.py

rallytime and others added some commits Nov 12, 2018

Update the bootstrap script documentation to point to bootstrap repo
This page is not updated very often and gets missed when various fixes/updates
go into the bootstrap script's repo. Instead of trying to maintain both pages,
the salt doc should have a general description with links to the bootstrap-repo
files.
Don't import obsolete Directive class from Sphinx
Directive was apparently removed from Sphinx and made part of docutils.
For some reason, in this saltdomain extension, we were importing both
from docutils and sphinx. This worked well enough while Directive was
still only deprecated, but it appears to recently have been removed,
meaning that it now just causes an ImportError.

This commit removes the redundant import.
Merge pull request #50478 from rallytime/update-bootstrap-docs
Update the bootstrap script documentation to point to bootstrap repo
Merge pull request #50480 from terminalmage/docs
Don't import obsolete Directive class from Sphinx
Merge pull request #50479 from Ch3LL/digital_ocean_location
Update digital ocean location for cloud tests
Fix test_matcher on Windows
Fixes a timeout issue in test_salt_documentation_arguments_not_assumed
Merge pull request #50494 from terminalmage/2017.7-docs
Late import to fix docs build errors
Merge branch 2017.7 into 2018.3
Conflicts:
  - doc/topics/tutorials/salt_bootstrap.rst
  - tests/integration/cloud/clouds/test_digitalocean.py

@garethgreenaway garethgreenaway self-requested a review Nov 14, 2018

@rallytime rallytime merged commit a50377b into saltstack:2018.3 Nov 14, 2018

9 of 10 checks passed

jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
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/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-2018.3 branch Dec 14, 2018

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.