rallytime e8e73b55ac Merge branch '2015.8' into '2016.3' ... Conflicts: - doc/topics/jobs/schedule.rst - salt/states/user.py		2016-08-26 13:21:12 -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-08-26 13:21:12 -06:00
job_cache.rst	Update job_cache and keep_jobs docs to be more specific to their behavior (#33328)	2016-05-19 09:32:32 -07:00