Erik Johnson 774a3f1147 Rename docker execution module to avoid shadowing in the loader ... With the merging of #39996, salt/modules/docker.py now imports salt.utils.docker. However, our loader appends the module dir (in this case salt/modules/) to sys.path temporarily for the length of the loading process. So, as the docker execution module tries to import salt.utils.docker, when salt.utils.docker attempts to do an "import docker", and docker-py is *not* installed, this results in salt/modules/docker.py (the docker execution module) being loaded in its place, which results in tracebacks in the minion log. Renaming the docker execution module keeps this import shadowing from occurring. Note that we don't need to do this for the placeholder salt/states/docker.py as it does not import salt.utils.docker.		2017-03-28 10:50:47 -05:00
..
integration	Overhaul Docker support	2017-03-21 16:53:19 -05:00
perf	Use print as a function [PEP 3105].	2015-12-04 16:17:35 -08:00
pkg/rpm	Updated salt.spec bash_completion	2016-04-07 09:16:47 -06:00
support	Gate class definitions	2017-03-11 19:46:23 +00:00
unit	Rename docker execution module to avoid shadowing in the loader	2017-03-28 10:50:47 -05:00
utils	Moved some test supporting modules to tests/support	2017-02-28 22:52:48 +00:00
__init__.py
buildpackage.py	[develop] Merge forward from 2016.3 to develop (#33193)	2016-05-12 07:53:39 -07:00
committer_parser.py
conftest.py	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
consist.py
eventlisten.py	Subscribe event to bus is optional now	2015-08-03 16:10:38 -06:00
eventlisten.sh	Move giant eventlisten.sh example out of the state.event docstring	2015-09-10 13:38:09 -06:00
jenkins.py	Splay sleeps inside jenkins	2015-12-16 14:48:51 -07:00
minionswarm.py	minionswarm.py: allow random UUID	2017-03-10 12:10:21 +01:00
modparser.py	No empty docstrings	2015-07-12 19:26:33 +01:00
packdump.py
runtests.py	Account for test module names prefixed with tests.	2017-03-03 12:41:27 +00:00
salt-tcpdump.py	No need to call .keys() when iterating a dictionary	2017-03-06 14:42:31 +00:00
saltsh.py
wheeltest.py
whitelist.txt	Add filerserver test to whitelist, skip symlink test	2017-03-10 11:05:02 -06:00