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

Back-port PR #51475 to 2018.3 #51527

Merged
merged 1 commit into from Feb 6, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Feb 6, 2019

Back-port PR #51475 to 2018.3

The change db0135e did not allow the
returner function to continue when the data key was not present. This
made the Elasticsearch returner inoperable for most cases.

 Conflicts:
	salt/returners/elasticsearch_return.py
@garethgreenaway garethgreenaway requested a review from saltstack/team-core Feb 6, 2019
@garethgreenaway

This comment has been minimized.

Copy link
Member Author

commented Feb 6, 2019

@cachedout FYI.

@dwoz
dwoz approved these changes Feb 6, 2019
@garethgreenaway garethgreenaway merged commit 5e840a5 into saltstack:2018.3 Feb 6, 2019
10 checks passed
10 checks passed
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 Python lint test 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/py2-windows-2016 The py2-windows-2016 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.