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

Documentation spelling fixes #35773

Merged
merged 1 commit into from
Aug 25, 2016
Merged

Conversation

rallytime
Copy link
Contributor

Fixes #35771

@rallytime rallytime merged commit cd90052 into saltstack:2016.3 Aug 25, 2016
@rallytime rallytime deleted the fix-35771 branch August 25, 2016 19:41
gitebra pushed a commit to gitebra/salt that referenced this pull request Aug 26, 2016
* upstream/develop:
  Documentation spelling fixes (saltstack#35773)
  Configure importing Mock to handle 'total' method from psutils properly
  Return psutil back to the list of mocked imports
  Improve Mock to be flexible and able to mock methods from the mocked modules
  Fixes Windows download paths (saltstack#35742)
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

1 participant