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

Proofread jinja_to_execution_module tutorial #38720

Conversation

dereckson
Copy link
Contributor

@dereckson dereckson commented Jan 13, 2017

Fix typo and remove repeated word.

@rallytime
Copy link
Contributor

Good catch @dereckson. Thanks!

@rallytime rallytime merged commit 6d3717b into saltstack:2016.3 Jan 13, 2017
gitebra pushed a commit to gitebra/salt that referenced this pull request Jan 18, 2017
* upstream/develop: (53 commits)
  Add CLI Examples for functions in the namecheap_ns execution module
  update adml text search to use 'starts-with' as some policies text has trailing spaces
  Fix saltstack#38775
  Adding unless-stopped as an option to restart policy.
  pillar/file_tree.py: Data read from files is now passed through the compile_template_str-function before being put into the pillar. Default renderer pipeline, as well as renderer blacklist and renderer whitelist can be configured from the salt master config.
  Fix Lint
  renderers/gpg.py: Pylint fixes
  renderers/gpg.py: Added check and workaround if data is of type cStringIO.InputType (which it is when handed from template.py)
  Add solrcloud module
  pep8
  No mutable default args, remove unneeded import
  DOCS: correct examples of running test suite
  DOCS: add links to File State Backups page where necessary (saltstack#38735)
  Pylint fix
  Proofread jinja_to_execution_module tutorial (saltstack#38720)
  Remove "event_publisher_pub_hwm" and "salt_event_pub_hwm" from config/__init__.py
  Fix for dynamic git_pillar when pillarenv is used
  Add NameError to exception in avahi_announce beacon
  The `test` option is only valid for the minion, not the master
  Localfs should also be changed of course
  ...
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