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

Clarify config.get docstring #35492

Merged
merged 3 commits into from
Aug 18, 2016

Conversation

terminalmage
Copy link
Contributor

@terminalmage terminalmage commented Aug 16, 2016

This pull request adds clarification that Salt's built-in config options cannot be overriden by config.get. It also reminds the user that pillar_opts must be set to True in order for this function to return values from the master configuration file.

This commit adds clarification that Salt's built-in config options
cannot be overriden by config.get.
@terminalmage terminalmage changed the base branch from develop to 2015.8 August 16, 2016 19:44
:ref:`here <configuration-salt-minion>`) will *always* be defined in
the Minion configuration and thus *cannot be overridden by grains or
pillar data*. However, additional (user-defined) configuration options
(as in the above example) will not by in the Minion configuration by
Copy link
Contributor

Choose a reason for hiding this comment

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

be instead of by?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep, good catch. Pushed a fix just now.

@cachedout cachedout added the Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged label Aug 17, 2016
@rallytime rallytime merged commit feb852f into saltstack:2015.8 Aug 18, 2016
@terminalmage terminalmage deleted the clarify-config.get branch November 30, 2016 03:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants