rallytime 2c4668a5cb Merge branch '2018.3' into 'develop' ... Conflicts: - salt/modules/kubernetes.py - salt/states/netconfig.py - salt/states/zfs.py - tests/integration/cloud/providers/test_profitbricks.py - tests/integration/scheduler/test_eval.py - tests/unit/grains/test_core.py - tests/unit/test_pillar.py		2018-03-27 11:57:29 -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	Various doc updates to fix warnings in doc build	2017-02-06 16:56:58 -07:00