Commit Graph

1 Commits (aa6c60ea80366ec8d753b36d8300d60e44ce89d6)

Author SHA1 Message Date
Matt Martz 07ca962417
Backport #38884 for 2.5 - docker/docker-py guard (#38889)
* Error if docker and docker-py are simultaneously (#38884)

* Error if docker and docker-py are simultaneously installed over top of each other. Fixes #36125

* Remove duplicate installed

(cherry picked from commit 68e3ff80a7)

* Add changelog for #36470
8 years ago