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.

Sign up for GitHub

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

Jump to bottom

Fix a minor typo in docs #36329

Merged
merged 1 commit into from
Sep 15, 2016
Merged

Fix a minor typo in docs #36329

merged 1 commit into from
Sep 15, 2016

Conversation

oz123
Copy link
Contributor

@oz123 oz123 commented Sep 15, 2016

As the title says, it's just a minor typo.

Please review Salt's Contributing Guide for best practices.

@rallytime rallytime added the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label Sep 15, 2016
@rallytime
Copy link
Contributor

Thanks @oz123!

@rallytime rallytime merged commit 04753bf into saltstack:develop Sep 15, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Sep 16, 2016
@jojohans
Merge remote-tracking branch 'upstream/develop' into develop
b3bb476 
* upstream/develop:
  Return AES key not found as error key in dict (saltstack#36225)
  Revert "Skip some tests on MacOS" (saltstack#36341)
  Fix a minor typo in docs (saltstack#36329)
  Remove reference to no-longer-skipped test
  Fix extend test
  Give each minion instance a new loop to avoid stale loops
  Safely shutdown the minion
  Ensure we have a test venv created using virtualenv < 13.0
  skip pip weird install test
  skip tests that timeout on MacOS
  Skip weird_install test on Mac OS X
  Fix test_issue_6833_pip_upgrade_pip test on OSX
@rallytime rallytime mentioned this pull request Sep 19, 2016
Merged
@rallytime rallytime added ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. and removed bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch labels Sep 19, 2016
rallytime pushed a commit that referenced this pull request Sep 19, 2016
Merge pull request #36419 from rallytime/bp-36329
bc703e2 
Back-port #36329 to 2016.3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@oz123 @rallytime