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

Backport #52754 into 2019.2.1 #53072

Merged
merged 1 commit into from
May 16, 2019
Merged

Conversation

Ch3LL
Copy link
Contributor

@Ch3LL Ch3LL commented May 16, 2019

Backport #52754 into 2019.2.1

… running on MacOS then we use that maximum.

Conflicts:
  - salt/log/setup.py
@twangboy twangboy merged commit f410346 into saltstack:2019.2.1 May 16, 2019
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.

3 participants