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

win_dacl state & module: return comment field as strings, not lists. #31779

Merged
merged 1 commit into from Mar 10, 2016
Merged

win_dacl state & module: return comment field as strings, not lists. #31779

merged 1 commit into from Mar 10, 2016

Conversation

sbreidba
Copy link
Contributor

@sbreidba sbreidba commented Mar 9, 2016

What does this PR do?

This alters the win_dacl state and module to return the 'comment' field as a string instead of a list, as per the state requirements.

What issues does this PR fix or reference?

Addresses issue #31772.

Previous Behavior

The state function comment returns were lists. This caused state/highstate output to appear as YAML.

New Behavior

State function comment returns are now strings, and state/highstate output appears normal (highstate format).

Tests written?

  • Yes
  • No

@rallytime
Copy link
Contributor

@sbreidba Excellent. Thanks!

@rallytime rallytime added the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label Mar 10, 2016
rallytime pushed a commit that referenced this pull request Mar 10, 2016
win_dacl state & module: return comment field as strings, not lists.
@rallytime rallytime merged commit a067de3 into saltstack:2015.8 Mar 10, 2016
@sbreidba sbreidba deleted the win-dacl-highstate-output-2015.8 branch March 10, 2016 17:42
@sbreidba
Copy link
Contributor Author

Whew - I wasn't sure what was going on with the build errors regarding tornado.ioloop...

@rallytime
Copy link
Contributor

@sbreidba Yeah, we're working on some PR test upgrades on our Jenkins server, and we're running the tests (old and new) in parallel so we can work out any kinks. So you're all good here! :)

@rallytime rallytime removed the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label Mar 11, 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