valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
101,872 Commits 24 Branches 182 Tags 341 MiB
c1bc627669
Commit Graph

325 Commits

Author SHA1 Message Date
C. R. Oldham
800113083b
Add event_listen_queue_max_seconds to fix #53411 2019-06-24 16:06:43 -06: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
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
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
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
Arthur Lutz
7e5cbb4998
[conf/master] doc typo 2018-03-06 17:33:56 +01:00
Nicole Thomas
0697ed0645
Merge branch 'develop' into accept-minions-from-grains 2017-12-04 16:10:32 -05:00
Thomas S Hatch
4a808827c8 Add a default config entry to the master config 2017-11-29 17:14:17 -07:00
Benedikt Werner
6900e6ece1
Merge branch 'develop' into accept-minions-from-grains 2017-11-17 19:35:53 +01:00
Erik Johnson
df972db3ba
Merge pull request #42930 from CorvinM/issue36942 
Jinja line statements and comments
 2017-11-13 12:02:16 -08:00
Benedikt Werner
d568c73c76
Prepend root dir config to autosign_grains_dir 2017-10-29 13:53:55 +01:00
Benedikt Werner
fbe4fa81d5
Added docs for autoaccepting grains 2017-10-29 13:53:49 +01:00
Benedikt Werner
53dd162729
Fixed grammar 2017-10-21 00:55:58 +02:00
Benedikt Werner
295b5d4834
Added tests and doc 2017-10-20 06:02:08 +02:00
Ronald van Zantvoort
e555b6351b doc fixes for salt-ssh roster(s) opts 2017-10-12 11:42:23 +02:00
Corvin Mcpherson
c67db52c73 Merge branch 'develop' into issue36942 2017-10-01 18:56:58 -04:00
Corvin Mcpherson
19dcfcf1a0 Add jinja_env and jinja_sls_env master configuration options documentation 2017-10-01 14:36:15 -04:00
Ronald van Zantvoort
bfbca748e2 highstate output: Document additional output modes 2017-09-25 18:32:52 +02:00
garethgreenaway
7091f8ec71 Merge branch 'develop' into issue36942 2017-09-22 16:33:29 -07:00
rallytime
3d0d9110ac Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/pillar/git_pillar.py
  - salt/utils/files.py
  - salt/utils/process.py
  - tests/unit/utils/test_which.py
 2017-08-24 15:33:15 -04:00
rallytime
bcbe180fbc Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-08-23 10:08:09 -04:00
Denys Havrysh
330d989b46 Import util modules on Master like it works on Minion 2017-08-23 11:28:02 +03:00
Denys Havrysh
af743ff6c3 [DOCS] Add missing utils sub-dir listed for extension_modules 2017-08-22 12:18:42 +03:00
Corvin Mcpherson
2dc593b48e Add jinja environment default options. 2017-08-16 20:02:13 -04:00
Corvin Mcpherson
23e1b23925 Change jinja line statement and line comment prefix default to '' instead of None 2017-08-15 02:13:43 -04:00
Corvin Mcpherson
eb713c699f Add jinja line statement and line comment options to master config. 2017-08-14 19:56:34 -04:00
Sigmon, Jeffrey
bb29afd022 Passphrase protect master private key 2017-07-27 13:17:26 -05:00
rallytime
1f0b90aa57 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/engines/slack.py
 2017-07-26 17:51:36 -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
e512a29f08 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/state.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - salt/version.py
  - tests/unit/config/test_config.py
  - tests/unit/modules/test_zypper.py
 2017-06-28 11:31:53 -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
add5b118a3 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/yumpkg.py
  - tests/unit/templates/test_jinja.py
 2017-06-19 14:12:36 -06:00
rallytime
58262608cd Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/config/__init__.py
  - salt/master.py
  - salt/modules/zypper.py
  - tests/unit/modules/timezone_test.py
 2017-06-16 10:43:02 -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
rallytime
89834e49c2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - conf/master
  - salt/utils/schedule.py
 2017-06-14 13:24:11 -06:00
C. R. Oldham
dadf4b851c Add documentation to the example master and minion configuration files. 
Move minion event signing to a saner place.
Enable dropping messages when signature does not verify or when
minion is not adding the signature to its payloads.
 2017-06-08 13:18:53 -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
Mike Place
3031a01266 Merge pull request #41021 from MTecknology/develop 
New feature: automatic job batching
 2017-05-05 10:20:04 -06:00