rallytime 5ff1ddb0dd Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/modules/cmdmod.py - salt/utils/schedule.py - tests/integration/files/conf/master - tests/integration/netapi/rest_tornado/test_app.py - tests/integration/runners/test_state.py - tests/integration/scheduler/test_eval.py		2018-08-10 14:18:34 -04:00
..
external_cache.rst	Fix various spelling mistakes	2018-03-08 15:25:42 +01:00
index.rst	Correction of cachedir error	2018-01-17 08:57:54 +08:00
job_cache.rst	Update backticks on job_cache docs	2018-08-03 12:03:37 -04:00