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
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
