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

Use upstream dockerpty 0.3.2 #588

Merged
merged 2 commits into from
Nov 4, 2014
Merged

Conversation

bfirsh
Copy link

@bfirsh bfirsh commented Oct 27, 2014

This reverts commit 60411e9.

Closes #556

Signed-off-by: Ben Firshman ben@firshman.co.uk

Conflicts:
requirements.txt
setup.py

@aanand
Copy link

aanand commented Oct 27, 2014

Looks fine in that it doesn't seem to break anything, but #568 is still happening for me.

@dnephin
Copy link

dnephin commented Oct 27, 2014

Do you mean #561 ? Edit: I believe #568 is related to docker 1.3, wouldn't be fixed by this change

@aanand
Copy link

aanand commented Oct 27, 2014

Sorry, yes, #561.

@dnephin
Copy link

dnephin commented Oct 27, 2014

Ya... I guess I didn't revert enough. Apparently it's not related to the select() change

@dnephin
Copy link

dnephin commented Oct 27, 2014

Sorry about that, I put up another PR at d11wtq/dockerpty/pull/23 which seems to actually resolve it

@bfirsh
Copy link
Author

bfirsh commented Oct 31, 2014

Pending release of dockerpty with d11wtq/dockerpty#24

This reverts commit 60411e9.

Closes docker#556

Signed-off-by: Ben Firshman <ben@firshman.co.uk>

Conflicts:
	requirements.txt
	setup.py
Patch from d11wtq/dockerpty#24

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
@bfirsh bfirsh changed the title Use upstream dockerpty 0.3.1 Use upstream dockerpty 0.3.2 Nov 4, 2014
@bfirsh
Copy link
Author

bfirsh commented Nov 4, 2014

dockerpty has been released so this is ready to merge.

@aanand
Copy link

aanand commented Nov 4, 2014

LGTM

aanand added a commit that referenced this pull request Nov 4, 2014
@aanand aanand merged commit 9260603 into docker:master Nov 4, 2014
@dnephin
Copy link

dnephin commented Nov 4, 2014

Thanks for applying my patch! I've still travelling and haven't had time to submit the pr

yuval-k pushed a commit to yuval-k/compose that referenced this pull request Apr 10, 2015
Use upstream dockerpty 0.3.2
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
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.

Switch back to upstream dockerpty
3 participants