rallytime 79bed6cff1 Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/cmdmod.py - salt/modules/reg.py - salt/modules/win_lgpo.py - salt/modules/win_path.py - salt/modules/win_pkg.py - salt/pillar/file_tree.py - salt/states/boto3_route53.py - salt/states/reg.py - salt/utils/win_functions.py - tests/unit/modules/test_kubernetes.py - tests/unit/modules/test_win_path.py		2018-02-23 09:50:19 -05:00
..
base.txt	Pin tornado version in requirements file	2018-02-16 12:05:18 -05:00
dev_python27.txt	include testinfra for testing kitchen tests	2017-10-17 14:59:10 -06:00
dev_python34.txt	add catchlog to py3 dev	2017-10-17 14:59:10 -06:00
opt.txt	nacl updates	2017-07-24 10:11:32 -04:00
pytest.txt	pytest-catchlog is also required for pytest-salt	2017-03-09 19:31:14 +00:00
raet.txt	Fix spacing	2016-08-16 13:16:59 -07:00
zeromq.txt	Fix spacing	2016-08-16 13:16:59 -07:00