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
Arthur Lutz
823af7cd72
[conf] doc typo
2018-03-06 17:36:28 +01: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
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
Klaus Kämpf
0cf36b487b
Run salt master as dedicated salt user
...
* Minion runs always as a root
2017-06-20 17:13:00 +01:00
