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

Fix client timeout issues #9307

Merged
merged 4 commits into from
Dec 19, 2013
Merged

Conversation

olliewalsh
Copy link
Contributor

Fixes issues #7157, #9302.
Probably #8845, #6064 and others too.

@thatch45
Copy link
Contributor

@cachedout, you have been in here most recently, can you take a look at this PR?

@cachedout
Copy link
Contributor

@thatch45 I'd be happy to! Reviewing now.

@cachedout
Copy link
Contributor

@thatch45 These changes all look right. Tests here are failing but they don't look related to these changes. I suspect a rebase against develop with the recent fixes to the MySQL tests would resolve them but since it's unrelated to the changes contained here, I think this PR should be merged.

thatch45 added a commit that referenced this pull request Dec 19, 2013
@thatch45 thatch45 merged commit a5f7360 into saltstack:develop Dec 19, 2013
@thatch45
Copy link
Contributor

Thanks!

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

3 participants