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

Adjust code examples to use the actual bootstrap-salt.sh file name #38011

Merged
merged 1 commit into from
Dec 1, 2016

Conversation

rallytime
Copy link
Contributor

No description provided.

@rallytime rallytime merged commit 6f34332 into saltstack:2016.11 Dec 1, 2016
@rallytime rallytime deleted the bootstrap-docs branch December 1, 2016 16:01
gitebra pushed a commit to gitebra/salt that referenced this pull request Dec 2, 2016
* upstream/develop: (28 commits)
  netconfig state doc
  New state: netconfig
  Replace usage of deprecated expr_form in tests
  Update systemd module unit tests to reflect new masking behavior
  Windows: Fix exception when certain grains are None
  Fix comment
  Added Carbon release notes. Fixed sphinx errors in the file. (saltstack#38022)
  Typo fix (saltstack#38015)
  Adjust code examples to use the actual bootstrap-salt.sh file name (saltstack#38011)
  Fix 'changes' for pip.installed from requirements
  Fix several minor linting issues with aptpkg
  Add expr_form deprecation to Nitrogen release notes
  Update gem test for 2016.11
  use sleep from path for docker.sls_build
  Remove initdb dependency to consume postgres module.
  Add absolute_import to please pylint
  Forgot a word in docs update
  Revert addition of pillar_roots_override_ext_pillar
  Fix RST link format (saltstack#37958) (saltstack#37970)
  Pylint fix (saltstack#37971)
  ...
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.

1 participant