Skip to content

Add '*' case to api_acl.#26083

Merged
whiteinge merged 1 commit intosaltstack:developfrom
TheScriptSage:develop
Aug 7, 2015
Merged

Add '*' case to api_acl.#26083
whiteinge merged 1 commit intosaltstack:developfrom
TheScriptSage:develop

Conversation

@TheScriptSage
Copy link
Copy Markdown

Hey folks.

In #25632 I added the api acl option, though we realized we also need a default case ('*'), so It's been added.

Should be a relatively minor change, I'll see what the tests say.

@TheScriptSage
Copy link
Copy Markdown
Author

Tests look unrelated.

Will wait til you guys get back to me.

Thanks.

whiteinge added a commit that referenced this pull request Aug 7, 2015
@whiteinge whiteinge merged commit c7f614e into saltstack:develop Aug 7, 2015
@whiteinge
Copy link
Copy Markdown
Contributor

Failures are unrelated. Thanks for the udpate.

@TheScriptSage
Copy link
Copy Markdown
Author

@whiteinge;

Hey, can this possibly make it into 2015.8? (The api_acl and the change), I see it's in develop but we want to cut a release internally and want to use it.

Thanks either way!

@whiteinge
Copy link
Copy Markdown
Contributor

@TheScriptSage the addition is safely config-gated so I'm good with it. If you open the pull req against 2015.8 I will sneak it in.

@jfindlay jfindlay added Core relates to code central or existential to Salt Salt-API Minor Change labels Aug 7, 2015
@TheScriptSage
Copy link
Copy Markdown
Author

@whiteinge - See #26279.

I hope I did this right, I'd like to look into getting this merged. :D Thanks!

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 Tests-Passed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants