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

[2016.3] Merge forward from 2015.8 to 2016.3 #35306

Merged
merged 9 commits into from
Aug 9, 2016

Conversation

rallytime
Copy link
Contributor

No conflicts.

terminalmage and others added 9 commits August 9, 2016 08:49
This allows the printing of namespaced events to be suppressed, for
instance in cases where we are running orchestration and don't want the
return data from a runner/wheel function to be printed to the console.
This gets passed through to the highstate outputter to suppress the
error in the output when the changes param is not a dict.
Resolve a couple bugs in orchestration output
@rallytime rallytime merged commit 31f7d30 into saltstack:2016.3 Aug 9, 2016
@rallytime rallytime deleted the merge-2016.3 branch August 9, 2016 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants