Skip to content

Use upstream dockerpty 0.3.2 - #588

Merged
aanand merged 2 commits into
docker:masterfrom
bfirsh:use-upstream-dockerpty
Nov 4, 2014
Merged

aanand merged 2 commits into
docker:masterfrom
bfirsh:use-upstream-dockerpty

Conversation

@bfirsh

@bfirsh bfirsh commented Oct 27, 2014

Copy link
Copy Markdown

This reverts commit 60411e9.

Closes #556

Signed-off-by: Ben Firshman [email protected]

Conflicts:
requirements.txt
setup.py

@aanand

aanand commented Oct 27, 2014

Copy link
Copy Markdown

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

@dnephin

dnephin commented Oct 27, 2014

Copy link
Copy Markdown

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

@aanand

aanand commented Oct 27, 2014

Copy link
Copy Markdown

Sorry, yes, #561.

@dnephin

dnephin commented Oct 27, 2014

Copy link
Copy Markdown

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

@dnephin

dnephin commented Oct 27, 2014

Copy link
Copy Markdown

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

@bfirsh

bfirsh commented Oct 31, 2014

Copy link
Copy Markdown
Author

Pending release of dockerpty with d11wtq/dockerpty#24

This reverts commit 60411e9.

Closes docker#556

Signed-off-by: Ben Firshman <[email protected]>

Conflicts:
	requirements.txt
	setup.py
@bfirsh
bfirsh force-pushed the use-upstream-dockerpty branch from 6412e1b to 8773f51 Compare November 4, 2014 10:26
@bfirsh bfirsh changed the title Use upstream dockerpty 0.3.1 Use upstream dockerpty 0.3.2 Nov 4, 2014
@bfirsh

bfirsh commented Nov 4, 2014

Copy link
Copy Markdown
Author

dockerpty has been released so this is ready to merge.

@aanand

aanand commented Nov 4, 2014

Copy link
Copy Markdown

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

dnephin commented Nov 4, 2014

Copy link
Copy Markdown

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 <[email protected]>
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