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

Merged
merged 17 commits into from Oct 29, 2018

Conversation

Projects
None yet
4 participants
@rallytime
Copy link
Contributor

commented Oct 29, 2018

No conflicts.

ethanculler and others added some commits Oct 23, 2018

Merge pull request #50251 from gtmanfred/2017.7
bump salt version to 2017.7.8 for test bootstrapping
Brett Benassi
Merge pull request #50258 from dubb-b/fix_cloud_ec2
Adding securitygroupname as the config instead of securitygroup
Merge pull request #50184 from ethanculler/fix-minion-return-exceptio…
…n-with-return

Added handling for minion return exceptions containing the word "return"

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

Brett Benassi and others added some commits Oct 29, 2018

Brett Benassi
Brett Benassi

@rallytime rallytime merged commit 10ba8b4 into saltstack:2018.3 Oct 29, 2018

6 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
Details
jenkins/pr/py3-windows-2016 running py3-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-centos-7 The py3-centos-7 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 Oct 29, 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.