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

Merged
merged 7 commits into from Oct 9, 2018

Conversation

Projects
None yet
4 participants
@rallytime
Copy link
Contributor

commented Oct 8, 2018

No conflicts.

twangboy and others added some commits Oct 4, 2018

Connect before processing presence
fire_event's timeout is in milliseconds. Under the hood it calls
connect_pull with a seconds timeout. Just call connect_pull directly
before processing presense events.
Merge pull request #49899 from twangboy/fix_49892
Remove arrInstalled artifact
Brett Benassi
Merge pull request #49900 from dwoz/presence_wart
Connect before processing presence
Merge pull request #49911 from dubb-b/slack-pr
Adding failure messages for PR.

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

@rallytime rallytime merged commit bce12c3 into saltstack:2018.3 Oct 9, 2018

6 of 10 checks passed

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