Skip to content
This repository has been archived by the owner on Mar 18, 2024. It is now read-only.

Revert "Merge pull request #202 from dongluochen/supportTcpUserTimeout" #216

Merged
merged 1 commit into from
Jan 14, 2016

Conversation

dongluochen
Copy link
Contributor

The TcpUserTimeout change requires cgo which is not supported in some systems. Revert it to not break current builds.

This reverts commit d72aea4, reversing
changes made to 73c9581.

Signed-off-by: Dong Chen dongluo.chen@docker.com

…rTimeout"

This reverts commit d72aea4, reversing
changes made to 73c9581.

Signed-off-by: Dong Chen <dongluo.chen@docker.com>
@vieux
Copy link
Contributor

vieux commented Jan 14, 2016

LGTM

vieux added a commit that referenced this pull request Jan 14, 2016
Revert "Merge pull request #202 from dongluochen/supportTcpUserTimeout"
@vieux vieux merged commit cce2561 into samalba:master Jan 14, 2016
This was referenced Jan 14, 2016
@dongluochen dongluochen deleted the undoUserTimeout branch January 14, 2016 01:14
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants