rallytime 893196d3e6 Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/conf.py - salt/loader.py - salt/modules/dockermod.py - salt/modules/sensehat.py - salt/utils/parsers.py - tests/integration/cloud/providers/test_ec2.py - tests/integration/modules/test_cp.py - tests/integration/modules/test_groupadd.py - tests/integration/spm/test_man_spm.py - tests/integration/states/test_npm.py - tests/unit/states/test_environ.py		2018-04-03 14:33:11 -04:00
..
__init__.py	Add spm build test	2017-10-18 17:15:42 -04:00
test_build.py	[PY3] Add unicode_literals to spm, queues, and rosters	2017-12-28 15:30:27 -06:00
test_files.py	[PY3] Add unicode_literals to spm, queues, and rosters	2017-12-28 15:30:27 -06:00
test_info.py	[PY3] Add unicode_literals to spm, queues, and rosters	2017-12-28 15:30:27 -06:00
test_install.py	[PY3] Add unicode_literals to spm, queues, and rosters	2017-12-28 15:30:27 -06:00
test_remove.py	[PY3] Add unicode_literals to spm, queues, and rosters	2017-12-28 15:30:27 -06:00
test_repo.py	[PY3] Add unicode_literals to spm, queues, and rosters	2017-12-28 15:30:27 -06:00