rallytime 82e73fe49d Merge branch '2018.3' into 'fluorine' ... Conflicts: - doc/ref/tops/all/index.rst - salt/fileclient.py - salt/grains/core.py - salt/modules/win_file.py - salt/pillar/__init__.py - salt/utils/http.py		2018-10-18 10:41:42 -04:00
..
__init__.py	Simple integration test to execute a batch command to help catch regressions	2014-07-09 15:41:18 -06:00
test_batch.py	Minor fix for def test_batch_run_grains_targeting	2018-10-05 09:02:15 +02:00
test_custom_module.py	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
test_grains.py	Merge branch '2018.3' into 'fluorine'	2018-08-30 14:39:48 -04:00