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

Backport #25243 into 2015.8 #27417

Merged
merged 2 commits into from Sep 28, 2015
Merged

Backport #25243 into 2015.8 #27417

merged 2 commits into from Sep 28, 2015

Conversation

whiteinge
Copy link
Contributor

Backport #25243 into 2015.8. Seems this fix barely missed the cutoff.

Fixes #27409.

Dmitry Kuzmenko added 2 commits September 25, 2015 12:41
1. Use low['args'] low['kwargs'] if specified and not empty in the low data.
2. Lookup root level and set kwargs in low data if missing.
@jfindlay jfindlay added Core relates to code central or existential to Salt Salt-API Master Change labels Sep 25, 2015
@cachedout
Copy link
Contributor

Go Go Jenkins!

cachedout pushed a commit that referenced this pull request Sep 28, 2015
@cachedout cachedout merged commit aefe6d7 into saltstack:2015.8 Sep 28, 2015
@whiteinge whiteinge deleted the bp-25243 branch April 13, 2016 03:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Core relates to code central or existential to Salt Salt-API
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants