valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
95,077 Commits 24 Branches 182 Tags 341 MiB
88673ad9e7
Commit Graph

617 Commits

Author SHA1 Message Date
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
Gareth J. Greenaway
741928bfee
Fixes per request from @rallytime. 2018-09-27 08:44:06 -07: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
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
Daniel Wallace
8c5c780292
switch skip-roster to update-roster 2018-05-09 12:51:53 -05: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
rallytime
9db4179462
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/unit/grains/test_core.py
 2017-12-12 15:24:30 -05:00
Daniel Wallace
9e5d6c03f8
Merge branch 'develop' into shade 2017-12-11 08:53:13 -07:00
Daniel Wallace
f7d182871e
remove openstack driver 2017-12-05 16:09:30 -07:00
Nicole Thomas
0697ed0645
Merge branch 'develop' into accept-minions-from-grains 2017-12-04 16:10:32 -05:00
chris ruscio
e2682bf441 Fix minion ping_interval documentation 2017-11-30 13:56:10 -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
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
garethgreenaway
7091f8ec71 Merge branch 'develop' into issue36942 2017-09-22 16:33:29 -07: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
Daniel Wallace
3bae894306
digitalocean should be one word. 
Everything on their webpage is a reference to DigitalOcean
 2017-09-19 12:47:16 -06:00
rallytime
bfcfcd75e8 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
  - salt/minion.py
  - salt/modules/alternatives.py
  - salt/modules/genesis.py
  - tests/unit/modules/test_hosts.py
  - tests/unit/modules/test_ini_manage.py
 2017-09-13 15:15:04 -04: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
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
78fd3f9b4d Merge branch 'develop' into issue36942 2017-08-17 16:18:46 -04: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
vernoncole
e970b0623a flesh out saltify driver 
(cherry picked from commit 0a730fb)
 2017-08-07 10:21:48 -06: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