rallytime 180c03ca24 Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/cli/salt.py - salt/modules/zypper.py - salt/scripts.py - salt/states/boto_elb.py - tests/integration/states/user.py - tests/unit/states/file_test.py		2016-05-06 09:20:05 -06:00
..
external_cache.rst	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
index.rst	Merge branch '2015.8' into '2016.3'	2016-05-06 09:20:05 -06:00
job_cache.rst	Additional docs on external and master job cache, assorted doc fixes	2015-07-08 20:33:34 -06:00