rallytime 3c298afa72 Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/modules/pip.py - salt/modules/reg.py - salt/modules/win_pkg.py - salt/runners/manage.py - salt/states/pkg.py - salt/transport/zeromq.py - salt/utils/event.py - tests/integration/modules/test_pip.py - tests/integration/states/test_user.py - tests/unit/grains/test_core.py - tests/unit/states/test_archive.py - tests/unit/utils/test_boto.py		2018-01-23 13:26:43 -05: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_man_spm.py	specify checking man page path	2018-01-19 17:53:20 -07: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