saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
99584 commits 34 branches 292 tags 803 MiB
Commit graph

251 commits

Author SHA1 Message Date
Ch3LL
09dd1cba8d
Update Fluorine references to 2019.2.0 2019-01-08 14:55:42 -05:00
rallytime
533cc617ad
Extend deprecation warning for enable_legacy_startup_events to Sodium 
This deprecation warning only went in recently and is new in Salt "Fluorine".
We need 2 full feature releases for deprecation warnings and "Neon" would
have only been 1 feature release cycle.
 2018-11-01 16:46:07 -04:00
rallytime
46c0e50638
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/man/salt.7
 2018-10-03 09:45:20 -04:00
Gareth J. Greenaway
741928bfee
Fixes per request from @rallytime. 2018-09-27 08:44:06 -07:00
rallytime
0c8b412556
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/integration/modules/test_archive.py
 2018-09-04 12:05:48 -04:00
rallytime
f7226f400f
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/osx/build_env.sh
  - salt/modules/win_useradd.py
  - salt/utils/yamldumper.py
  - tests/integration/modules/test_archive.py
  - tests/integration/output/test_output.py
 2018-08-30 14:23:23 -04:00
Erik Johnson
49ed156dd5
Add enable_gpu_grains to the minion config stub 2018-08-28 11:28:03 -05:00
rallytime
ae201823c1
Deprecate 'master_shuffle' in favor of 'random_master' 2018-07-12 13:43:06 -04:00
rallytime
0fcf4c54d1
Add no_proxy option to cont/minion docs and Fluorine release notes 
Also cleans up a couple of items based on the feedback in #43764
 2018-06-13 15:49:00 -04:00
Brendan Beveridge
cc85427724
add support for no_proxy for apt pkg and generic http util 2018-06-13 15:41:09 -04:00
Dmitry Kuzmenko
6bcafcf30a
Updated confusing docstring for tcp_pub/pull_port in conf examples 2018-04-24 02:00:17 +03:00
Erik Johnson
7070a3be48
Update default renderer to jinja|yaml, improve renderer docs 
`yaml_jinja` and all legacy renderer syntax has been transparently
translated to the render pipeline syntax (e.g `jinja|yaml`)
under-the-hood for several years now, this just makes the default
renderer adhere to the render pipeline syntax.

It also makes significant improvements to the renderer documentation.
 2018-04-16 22:35:23 -05:00
David Boucha
cf5dcbd9c8 Add docs and defaults for sending old event types 2018-03-08 15:34:43 -07:00
Arthur Lutz
2fc30b7b01
[conf/minion] doc typo 2018-03-06 17:34:21 +01:00
rallytime
9ded5e1cbb
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/config/__init__.py
  - salt/grains/core.py
  - salt/modules/win_lgpo.py
  - salt/returners/mysql.py
  - salt/states/libcloud_dns.py
  - tests/integration/runners/test_runner_returns.py
  - tests/unit/grains/test_core.py
 2017-12-21 15:58:08 -05:00
rallytime
9db4179462
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/unit/grains/test_core.py
 2017-12-12 15:24:30 -05:00
chris ruscio
e2682bf441 Fix minion ping_interval documentation 2017-11-30 13:56:10 -05:00
Benedikt Werner
fbe4fa81d5
Added docs for autoaccepting grains 2017-10-29 13:53:49 +01:00
Nicole Thomas
3f77571dad Merge branch 'develop' into high-out-by_id 2017-09-28 13:27:47 -04:00
Ronald van Zantvoort
bfbca748e2 highstate output: Document additional output modes 2017-09-25 18:32:52 +02:00
Silvio Moioli
fd4194ade0 process_count_max: disable by default 2017-09-22 21:57:54 +02:00
Silvio Moioli
4d181ea523 process_count_max: add defaults and documentation 2017-09-22 21:57:02 +02:00
rallytime
ef7b4242c3 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-11 12:24:10 -04:00
Ken Jordan
ba0cdd4536 Fix phrasing for mine_interval description 2017-09-01 15:13:20 -06:00
Ken Jordan
9ff03c2d43 Update Salt Mine documentation to show that the mine_interval option is configured in minutes. 2017-09-01 14:57:10 -06:00
rallytime
c673b64583 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/conf.py
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
  - salt/engines/hipchat.py
  - salt/engines/slack.py
  - salt/grains/core.py
  - salt/version.py
  - tests/integration/states/test_renderers.py
 2017-07-20 09:54:08 -06:00
rallytime
b40f980632 Add more documentation for config options that are missing from master/minion docs 2017-07-14 17:26:02 -06:00
rallytime
2cfabc467c Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/windows/req.txt
  - salt/modules/dockermod.py
 2017-06-19 14:17:01 -06:00
rallytime
c828ad803a Add a bunch of config options to the various master/minion files that are missing 
I started on these a while ago and never submitted them. I added a couple more today
and figured I should get these in.

Refs #32400
 2017-06-15 16:21:47 -06:00
Felix Dreissig
5b55fb2452 Fix comments about the "hash_type" option 
Previous mentions of the correct default value (it really is sha256)
somehow got lost along the way.
Also, some comments seem to have gotten duplicated instead of updated.
 2017-05-09 11:10:29 -06:00
rallytime
6493880bde Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-04-18 16:42:30 -06:00
Mike Place
8ab321f934 A random startup delay option for minions 
This allows minions to spread out the load to the master if a large number
of them start up at once.
 2017-04-18 08:34:56 -06:00
rallytime
e90622bc22 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/dockermod.py
  - salt/modules/file.py
 2017-04-11 15:03:34 -06:00
Daniel Wallace
a86b101ae6 add retries on authentications of the salt minion reconnecting 2017-04-10 14:53:26 -06:00
Nicole Thomas
8809d33674 Merge pull request #39701 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-28 12:50:10 -07:00
rallytime
b4366103a6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - .pylintrc
  - .testing.pylintrc
  - salt/fileclient.py
  - salt/minion.py
  - salt/modules/docker.py
  - salt/modules/win_iis.py
  - salt/states/docker.py
  - salt/states/file.py
  - salt/utils/__init__.py
  - tests/integration/modules/test_sysmod.py
 2017-02-27 15:11:37 -07:00
Mike Place
cbd66a0d3f Merge pull request #39676 from F30/hash-comment 
Fix comments about the "hash_type" option
 2017-02-27 13:11:40 -07:00
Felix Dreissig
5371bc0996 Fix comments about the "hash_type" option 
Previous mentions of the correct default value (it really is sha256)
somehow got lost along the way.
Also, some comments seem to have gotten duplicated instead of updated.
 2017-02-26 23:24:54 +01:00
Felix Dreissig
78a185ab11 Fix comments about file backup directory 
The actual file state backup directory is called "file_backup" without a
trailing 's'.
 2017-02-26 22:49:29 +01:00
Mike Place
1dba2f9cb0
Add warning in docs 2017-02-22 11:44:38 -07:00
Erik Johnson
591b9ed9c4 Add pillarenv_from_saltenv to example minion config file 2016-12-25 11:36:40 -06:00
rallytime
efb8a8ddf5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/config/__init__.py
  - salt/minion.py
 2016-12-22 10:39:14 -07:00
David Boucha
11863a4bfe add examples of default minion returners 2016-12-19 13:47:40 -07:00
Dmitry Kuzmenko
0c607ccaec An example configuration for TLS/SSL. (#37859) 2016-11-23 09:38:16 -07:00
rallytime
7f955bda0a Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/modules/puppet_test.py
 2016-09-08 10:55:57 -06:00
Nicole Thomas
7cdbc546f1 Back-port #36062 to 2015.8 (#36118) 
* Comment all lines in the minion config file

* Add unit tests to check for all files in conf/ to be commented out

* Make sure cont/cloud.profiles file is commented out

Matches the cloud.providers file format and other sample config files.

* Add unit tests for sample files in cloud.profiles.d, cloud.providers.d,
and cloud.maps.d

* Make sure all sample config files in cloud.maps.d are commented out

* Make sure all sample config files in cloud.profiles.d are commented out
 2016-09-07 16:01:34 -06:00
rallytime
9828a0dbfa Comment all lines in the minion config file 2016-09-05 17:30:59 -06:00
C. R. Oldham
908234d9ab Document module whitelisting. Remove FIXME comments for disable_modules and disable_returners as they are definitely implemented. (#35717) 2016-09-01 09:40:36 -06:00
Mike Place
69b44bc6f8 Merge pull request #35500 from rallytime/fix-35068 
Add docs for pillar_raise_on_missing option
 2016-08-17 18:15:29 +09:00
rallytime
cface344d6 Add docs for pillar_raise_on_missing option 
Fixes #35068
 2016-08-16 14:57:58 -06:00