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 |
|
Denys Havrysh
|
0faa490991
|
Fix job scheduling using `when parameter (by python-dateutil `)
|
2016-07-26 17:37:28 +03:00 |
|
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 |
|
Jacob Hammons
|
b192a9ba38
|
Doc restructuring, organization, and cleanup. Updated the doc navigation.
|
2016-01-31 20:10:02 -07: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 |
|
Nitin Madhok
|
10ecc9b1c8
|
Formatting path
|
2014-08-25 13:49:49 -04: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 |
|
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 |
|