Colton Myers 2a144b954a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/ref/states/requisites.rst doc/topics/tutorials/states_pt5.rst salt/cloud/clouds/ec2.py salt/config.py salt/minion.py salt/modules/cp.py salt/pillar/__init__.py salt/states/file.py		2015-07-14 10:57:36 -06:00
..
external_cache.rst	Fixed typos	2015-07-08 21:12:24 -06:00
index.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
job_cache.rst	Additional docs on external and master job cache, assorted doc fixes	2015-07-08 20:33:34 -06:00
schedule.rst	Merge pull request #25023 from pengyao/schedule_typo	2015-06-28 07:25:48 -06:00