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

654 commits

Author SHA1 Message Date
Daniel Wozniak
f7804af95f
Merge branch 'master' into master-port-49955 2020-04-21 17:54:32 -07:00
Gareth J. Greenaway
7221d50450
Finalizing ability to disable requisites during State runs. Adding to configuration and documentation. 2020-04-21 15:16:34 -07:00
Nico
c3b7175c71 Fix config and doc for option master_roots 2020-04-21 10:26:18 +01:00
Daniel A. Wozniak
67d7a5a427 Merge branch 'master' into pr/56249 2020-04-20 06:56:47 +00:00
ch3ll
0c365c19a4
add --pre-flight ssh option 2020-04-09 15:40:03 -04:00
Pavel Skuratovich
cdd7ec02c3 Replace incorrectly used "it's" by "its" 2020-02-26 00:57:58 +03:00
Nico
3a8baebf3e Fixed option 'master_roots' in config and docs 2020-02-05 16:44:00 +00:00
Gareth J. Greenaway
f99b6762dd
various netapi fixes and tests 2020-01-16 09:31:58 -08:00
Pedro Algarvio
18a679681b
Merge branch 'master' into pass-grains-in-minion-startup-event 2020-01-13 16:56:43 +00:00
Daniel Wozniak
b6374019b4
Merge pull request #55830 from stratusjerry/TypoFix 
Fix Typos
 2020-01-11 10:38:14 -07:00
stratusjerry
b3567228d1 Fix Typos 2020-01-09 13:57:45 -05:00
Wayne Werner
f925ff7fd4
Typo and formatting fixes. 2019-12-11 14:37:05 -07:00
Li Kexian
6909e37ca3
add tencentcloud conf example 2019-12-11 14:34:36 -07:00
Daniel Wozniak
82794696fb
Merge branch 'master' into master 2019-11-20 01:05:39 -07:00
Abid Mehmood
6aedf5854f enable passing grains to start event based on 'start_event_grains' configuration parameter 2019-10-29 15:40:14 +01:00
markuskramerIgitt
7db6705cca
doc_ipc_mode_Windows_against_master 2019-10-17 16:07:45 +02:00
Nicole Scherfenberg
e74cbdf87d solves #54837 2019-10-09 14:04:46 +02:00
C. R. Oldham
800113083b
Add event_listen_queue_max_seconds to fix #53411 2019-06-24 16:06:43 -06:00
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
82e73fe49d
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/ref/tops/all/index.rst
  - salt/fileclient.py
  - salt/grains/core.py
  - salt/modules/win_file.py
  - salt/pillar/__init__.py
  - salt/utils/http.py
 2018-10-18 10:41:42 -04:00
rallytime
f8e73e8ae2
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/beacons/inotify.py
 2018-10-10 15:13:23 -04:00
rallytime
216fd64013
Remove event_publisher_pub_hwm and salt_event_pub_hwm from documentation 
Fixes #49925

The `event_publisher_pub_hwm` and `salt_event_pub_hwm` configuration options
were removed in #38723. (They are obsolete and not used within salt any longer.)

When those options were removed, I neglected to remove them from the docs. This
PR cleans up the references in the docs.
 2018-10-08 10:51:01 -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
Erik Johnson
d1b7fb449c
Revert "Update documentation to correctly state enable_gpu_grains default" 
This reverts commit 2fe675cfdd.
 2018-08-28 11:17:32 -05:00
rallytime
da3a29c680
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/integration/states/test_file.py
 2018-08-28 12:06:32 -04:00
rallytime
c3ecefc785
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/file.py
  - salt/modules/win_service.py
  - salt/states/mount.py
  - salt/states/service.py
  - tests/integration/__init__.py
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/unit/states/test_file.py
 2018-08-23 11:50:41 -04:00
Mike Place
f8c55b85e1
Merge pull request #49184 from ralish/external_nodes_docs 
Remove obsolete documentation on external_nodes setting
 2018-08-18 08:50:10 -04:00
Samuel D. Leslie
2fe675cfdd
Update documentation to correctly state enable_gpu_grains default 
While the relevant code in grains/core.py does enable GPU grains by
default, the default in config/__init__.py for the DEFAULT_MASTER_OPTS
dictionary is disabled. This takes precedence over the default in
grains/core.py which would only take effect if the enable_gpu_grains
setting was not specified at all.
 2018-08-18 13:47:53 +10:00
Samuel D. Leslie
2e29b292bf
Remove obsolete documentation on external_nodes setting 
This setting is no longer used anywhere in the codebase having been
superseded by the master_tops setting many releases ago.
 2018-08-18 13:11:02 +10: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
rallytime
8d3c2be61c
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/kubernetes.py
  - salt/modules/opkg.py
  - salt/modules/useradd.py
  - salt/output/table_out.py
  - salt/states/mysql_query.py
  - salt/states/user.py
 2018-05-23 12:57:58 -04:00
Daniel Wallace
8c5c780292
switch skip-roster to update-roster 2018-05-09 12:51:53 -05: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
Rémy Léone
e11dca08ac Add Scaleway to cloud providers examples 2018-04-16 15:43:03 +02:00
David Boucha
cf5dcbd9c8 Add docs and defaults for sending old event types 2018-03-08 15:34:43 -07:00
Arthur Lutz
823af7cd72
[conf] doc typo 2018-03-06 17:36:28 +01:00
Arthur Lutz
ebf1ab0399
[conf/proxy] doc typo 2018-03-06 17:34:52 +01:00
Arthur Lutz
2fc30b7b01
[conf/minion] doc typo 2018-03-06 17:34:21 +01:00
Arthur Lutz
7e5cbb4998
[conf/master] doc typo 2018-03-06 17:33:56 +01:00
Arthur Lutz
733db23aec
[conf/cloud] doc typo 2018-03-06 17:32:17 +01:00
Jasper Lievisse Adriaanse
e1bfb804de
update the default configuration for joyent with a keyname 
this parameter is mandatory as otherwise the user is presented with
a puzzling HTTP 401
 2017-12-22 20:09:45 +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