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

Merged
merged 6 commits into from Sep 18, 2018

Conversation

Projects
None yet
3 participants
@rallytime
Copy link
Contributor

commented Sep 18, 2018

Conflicts:

  • salt/pillar/cmd_yamlex.py

rallytime and others added some commits Sep 17, 2018

Fix heading line-lengths
This will clean up some of the warnings found by building the documentation:

```
/root/SaltStack/salt/doc/ref/pillar/all/index.rst:55:<autosummary>:1: WARNING: Unexpected section title or transition.

=================
```
Merge pull request #49689 from terminalmage/2017.7-docs
Fix docs build errors (2017.7 branch)
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/pillar/cmd_yamlex.py

@rallytime rallytime requested a review from saltstack/team-core as a code owner Sep 18, 2018

@dwoz

dwoz approved these changes Sep 18, 2018

@rallytime rallytime merged commit 0c4005d into saltstack:2018.3 Sep 18, 2018

5 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
Details
jenkins/pr/py2-windows-2016 running py2-windows-2016...
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Sep 18, 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.