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		2018-04-20 11:41:35 -05:00
..
fragments	Backport #38884 for 2.5 - docker/docker-py guard (#38889)	2018-04-20 11:41:35 -05:00
CHANGELOG-legacy.rst	rename versioned CHANGELOGs with dash	2018-02-22 17:32:58 -08:00
CHANGELOG-v2.0.rst	sync old changelogs	2018-03-22 16:45:26 -07:00
CHANGELOG-v2.1.rst	sync old changelogs	2018-03-22 16:45:26 -07:00
CHANGELOG-v2.2.rst	sync old changelogs	2018-03-22 16:45:26 -07:00
CHANGELOG-v2.3.rst	sync old changelogs	2018-03-22 16:45:26 -07:00
CHANGELOG-v2.4.rst	sync old changelogs	2018-03-22 16:45:26 -07:00
CHANGELOG-v2.5.rst	New release v2.5.1	2018-04-18 16:48:39 -07:00
config.yaml	reformat multiline bugfix entries	2018-02-21 13:51:40 -08:00