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 2018.3.3 to 2018.3 #49842

Merged
merged 11 commits into from Oct 1, 2018

Conversation

Projects
None yet
3 participants
@rallytime
Copy link
Contributor

commented Sep 30, 2018

No conflicts.

Ch3LL and others added some commits Sep 21, 2018

Merge pull request #49741 from Ch3LL/change_log
Add Changelog for 2018.3.3
Merge pull request #49742 from Ch3LL/man_8.3
Update man pages for 2018.3.3
Merge pull request #49743 from Ch3LL/8.3_in_progress
Remove In Progress note for 2018.3.3 release
Merge pull request #49761 from Ch3LL/api_401
Handle Auth exceptions in run_job

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

Add "in progress" notation back to the 2018.3.3 release notes
This has been removed in the 2018.3.3 branch for release prep, but the docs
on the main website still need to say this is in progress until we release.

@rallytime rallytime merged commit bf9c175 into saltstack:2018.3 Oct 1, 2018

3 of 10 checks passed

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

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