Commit Graph

48 Commits

Author SHA1 Message Date
Nicole Thomas
336fbb03bc [develop] Merge forward from 2016.3 to develop (#33408)
* Fix master hanging after a request from minion with removed key. (#33333)

* ZMQ monitor for MWorker connections.

* Reauth minion if the key was removed on the master side.

* Allow concurrency mode in state runs if using sudo (#33325)

Closes #30130

* Disambiguate non-exact matches when checking if sysv service is enabled (#33324)

Fixes #33323

* remove redundant, incorrect sudo_runas config documentation (#33318)

* remove sudo_runas documentation

`sudo_runas` was renamed to `sudo_user` and the documentation was not
updated accordingly.

* conf/minion: update sudo_user description

The description from sudo_runas was better.

* import ps from psutil_compat in beacons (#33334)

* beacons.network_info: import gate psutil

* beacons.ps: import gate psutil

* Add docs for mine_functions config var (#33326)

* Add docs for mine_functions config var

* Note that mine_enabled essentially just doesn't add the mine
update function to the scheduler.

* Bp 28467 calm mine (#33327)

* make minion mine update behavior more configurable

* Add docs for mine_functions config var

* Remove config dup from mine config options

Refs #28467

* 2015.8 does not have _DFLT_MULTIPROCESSING_MODE

* This won't be in until 2015.8.10.

* Fix network.managed for windows (#33312)

* Fix some link errors in the test writing tutorial (#33347)

* Describes parameters in register_instances function (#33339)

* Fix UnboundLocalError in git.latest (#33340)

Resolves #32260.

* Expanded documentation for boto_elb state and module (#33341)

* Describes what happens when the CNAME parameter is given.

* Describes what the recognized attributes are for for ELBs.

* Properly detect newer Linux Mint distros (#33359)

* Properly detect newer Linux Mint distros

LMDE 2 and Linux Mint 17.3 changed the DISTRIB_ID in /etc/lsb-release to
``LinuxMint``, breaking OS detection for these distros.

This commit fixes that by adding an entry to the OS_NAME_MAP in the core
grains.

* Remove LinuxMint os_family from aptpkg.py

It is no longer necessary as the distro is now detected properly, which
will lead to an os_family of Debian.

* Update job_cache and keep_jobs docs to be more specific to their behavior (#33328)

* Update job_cache and keep_jobs docs to be more specific to their behavior

Also fixed a bug discovered when investigating job_cache/keep_jobs functionality
where the jid directory and files were removed by the cache cleaner, but not the
original jid clash detection directory created in /var/cache/salt/master/jobs/.

Fixes #29286

* Add testcase for the changes in the local_cache.clean_old_jobs func

* Mark tests as destructive

* Put destructive test decorator in correct location

* Remove mentions of windows not supporting pkgs param (#33361)

Fixes #33313

* Updates docs version to 2015.8.9
Adds note regarding the os grain on Mint Linux
Adds an FAQ regarding grains that change due to upstream changes

* revved 2015.8 branch to .9 in version selector

* Add initscripts, SystemD service units and environment files for Debian (#32857)

* Add note to docs about api settings for Hipchat API v2 (#33365)

Fixes #27779

* Add win_pkg to list of modules that support "version" in pkg.installed (#33362)

Fixes #32913

* Add note about name parameter in git_pillar docs (#33369)

Fixes #27737

* Better YAML syntax error handling (#33375)

Closes #26574

* Improve doc clarity for disable_modules documentation (#33379)

* Improve doc clarity for disable_modules documentation

* Additional clarification on blacklisted name

* maintain the fallabck because I am totally sick of this crap

* blast, put the try/except int he right place

* restore whitespace

* Fix traceback in logging for config validation (#33386)

* 2015.8.10 release notes

* Sync pillarstack to latest upstream version (#33391)

* Don't lay down all available opts (#33385)

* Don't lay down all available opts

* We need at least one opt in there

* Condense defaults

* Put the default hash type back
2016-05-20 13:48:40 -07: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
Nicole Thomas
111701c8bb [2015.8] Merge forward from 2015.5 to 2015.8 (#33054)
* Add run_on_start docs to schedule.rst (#32958)

Fixes #22580

* Backport #33021 manually to 2015.5 (#33044)

* Saltfile with pillar tests (#33045)

* add file.managed with pillar data tests

* do not require git for other tests

* Whitespace...
2016-05-05 07:05:55 -07:00
rallytime
7554d0f42d Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/ref/states/include.rst
  - doc/topics/cloud/reactor.rst
  - doc/topics/reactor/index.rst
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/tutorials/states_pt5.rst
  - doc/topics/windows/windows-package-manager.rst
  - salt/config.py
  - salt/modules/state.py
  - salt/states/grains.py
  - tests/integration/modules/sysmod.py
  - tests/unit/states/grains_test.py
2016-03-24 15:48:00 -06:00
Erik Johnson
1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply
Resolves #32037.
2016-03-21 22:56:17 -05:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3'
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
Jacob Hammons
b192a9ba38 Doc restructuring, organization, and cleanup. Updated the doc navigation. 2016-01-31 20:10:02 -07:00
Duncan Mac-Vicar P
e7bbcb7988 Document schedule once option
closes #23742
2016-01-08 11:35:44 +01:00
Colton Myers
1e1f5f3a95 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/conf.py
    doc/topics/cloud/config.rst
    doc/topics/cloud/index.rst
    salt/modules/git.py
    salt/states/git.py
    salt/states/pkgrepo.py
2015-09-01 15:35:21 -06:00
Jacob Hammons
992edc3bb8 Doc bug fixes
Refs #26192
Refs #26638
Refs #26644
Refs #26108
2015-08-31 16:05:50 -06:00
Mike Place
f03f460af2 Update docs to remove state.over
Closes #26039
2015-08-06 15:24:39 -06:00
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