Commit Graph

36 Commits

Author SHA1 Message Date
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
Jacob Hammons
57dfa92d5a Fixed typos 2015-07-08 21:12:24 -06:00
Jacob Hammons
2f9e5b9125 Additional docs on external and master job cache, assorted doc fixes
Refs #25277
2015-07-08 20:33:34 -06:00
Joseph Hall
64cdd85584 Merge pull request #25023 from pengyao/schedule_typo
fixed a typo
2015-06-28 07:25:48 -06:00
pengyao
083f879afd a typo 2015-06-28 20:27:49 +08:00
Mike Place
7dae045b3c Remove overstate documentation 2015-06-12 13:00:08 -06:00
Corin Kochenower
f44e25715a Add detail for writing a returner 2015-03-31 13:59:11 -06:00
Thomas Jackson
4d41fa35a1 Comma cleanup 2014-12-12 11:40:36 -08:00
Thomas Jackson
498a612078 Whitespace cleanup
Conflicts:
	doc/topics/cloud/linode.rst
	doc/topics/cloud/misc.rst
	doc/topics/cloud/parallels.rst
	doc/topics/cloud/proxmox.rst

Conflicts:
	doc/topics/development/architecture.rst
	doc/topics/development/translating.rst
2014-12-11 07:53:19 -08:00
Daniel Nägele
81164c17e7 document the dependencies for the schedule options 'when' and 'range' 2014-12-02 13:33:50 +01:00
Nitin Madhok
b7d5b2cde2 Fixing sphinx violations and errors 2014-09-12 13:28:01 -04:00
Chris Rebert
3053248b67 fix typos in doc/topics/jobs/job_cache.rst 2014-09-04 12:16:45 -07:00
David Boucha
a2cc5cbaaa fix grammar 2014-09-03 16:40:05 -06:00
David Boucha
bc7b3289e8 fix some misspellings and grammar 2014-09-03 16:40:05 -06:00
Thomas S Hatch
53855f7886 Add doc on job cache 2014-09-03 15:36:48 -06:00
Nitin Madhok
10ecc9b1c8 Formatting path 2014-08-25 13:49:49 -04:00
rallytime
ded01bfefd Fix broken link in schedule docs 2014-08-20 16:10:03 -06:00
Carl Meyers
7c4ce67d28 Schedule documentation update. 2014-08-18 21:20:54 -07:00
rallytime
8dcedf684d Change more affected docs from Helium to 2014.7.0 2014-07-15 17:02:19 -06:00
Mike Place
8b03270e1f More comprehensive documentation on scheduler 2014-05-19 14:58:24 -06:00
Chris Rebert
8af229253f more copyediting 2014-04-30 13:55:48 -07:00
xenuser
92f3f6c58f Update schedule.rst
I think "and" is meant here.
2014-03-23 00:21:59 +01:00
Mike Place
c1139a947f Typo fix. 2014-03-10 09:45:11 -06:00
Seth House
07802e34c5 Added best practice, jobs, and scheduler headings to the index 2014-03-01 23:13:23 -07:00
Mike Place
826bad4cfb Merge conflict and rebase.
Conflicts:
	doc/ref/renderers/index.rst
2014-02-26 13:32:08 -07:00
Mike Place
6af7ff5dff First pass at refactoring Salt documentation. 2014-02-26 13:31:11 -07:00
Mike Place
a112eadc5b Starting on index for jobs. 2014-02-19 16:57:04 -07:00
dan
46c275b771 The code or schedule had a better example than the doc. 2014-01-29 00:06:08 -05:00
Thomas S Hatch
7b399bd752 Add header for schedule returner 2013-05-28 05:27:14 +00:00
Thomas S Hatch
ed471565f3 Make it more clear that runners are called on the master per #4643 2013-05-01 17:16:15 -06:00
John Albietz
1928502214 'schedule' typo. 2013-02-05 02:27:31 -08:00
Thomas S Hatch
05d2976ed4 Add scheduler doc 2013-01-14 14:38:24 -07:00
Thomas S Hatch
285e82d104 Add some examples to jobs doc 2012-05-30 15:39:27 -06:00
L.C. Rees
3315dad9e7 documentation updates 2012-05-22 22:43:12 -06:00
Jeff Schroeder
1a6e48de89 Fix some sphinx warnings in the jobs docs 2012-03-18 18:04:25 -07:00
Thomas S Hatch
c295899f85 Ad initial docs for the jobs interface 2012-01-31 23:27:09 -07:00