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

Fix #34345 #34837

Merged
merged 1 commit into from
Jul 21, 2016
Merged

Fix #34345 #34837

merged 1 commit into from
Jul 21, 2016

Conversation

thatch45
Copy link
Contributor

@thatch45 thatch45 commented Jul 20, 2016

What does this PR do?

Add delimiter to the salt-ssh grains wrapper

What issues does this PR fix or reference?

#34345

@@ -67,7 +69,35 @@ def get(key, default=''):

salt '*' grains.get pkg:apache
'''
return salt.utils.traverse_dict_and_list(__grains__, key, default)
if ordered is True:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I copied this ordered section from salt.modules/grains.py, it makes no sense to me

@cachedout cachedout merged commit 52a95b2 into saltstack:2016.3 Jul 21, 2016
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.

None yet

2 participants