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

Prevent issues when installing docker and docker-py in the same environment #1399

Merged
merged 1 commit into from
Jan 20, 2017

Conversation

shin-
Copy link
Contributor

@shin- shin- commented Jan 19, 2017

Fixes #1395

Also #1370 , docker/compose#4344 and a few others...

…onment

Signed-off-by: Joffrey F <joffrey@docker.com>
@shin- shin- added the kind/bug label Jan 19, 2017
@shin- shin- added this to the 2.1.0 milestone Jan 19, 2017
@shin-
Copy link
Contributor Author

shin- commented Jan 19, 2017

docker/compose#4356

@shin- shin- modified the milestones: 2.0.2, 2.1.0 Jan 20, 2017
@shin- shin- merged commit bcb869b into master Jan 20, 2017
@shin- shin- deleted the 1395-docker-py-conflict branch January 26, 2017 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant