 Gareth J. Greenaway
|
11cd485a8b
Merge branch '2018.3' into merge-2019.2
|
vor 5 Jahren |
|
Akmod
|
8e1ec15c39
Add missing master/minion docs for log_rotate*
|
vor 5 Jahren |
|
Gareth J. Greenaway
|
6c99cb161f
Merge branch '2018.3' into merge-2018.3
|
vor 5 Jahren |
|
Mathieu Parent
|
7ca2aa4919
Allow dynamic file_roots
|
vor 6 Jahren |
|
Ch3LL
|
09dd1cba8d
Update Fluorine references to 2019.2.0
|
vor 5 Jahren |
|
Gareth J. Greenaway
|
2ea7404d73
Merge branch '2018.3' into merge-fluorine
|
vor 5 Jahren |
|
Gareth J. Greenaway
|
12f75834aa
Merge branch '2017.7' into merge-2018.3
|
vor 5 Jahren |
|
rallytime
|
43c39e7408
Add documentation to master config docs for job_cache_store_endtime
|
vor 6 Jahren |
|
rallytime
|
887cd070ca
Add some salt-api options to the master config docs
|
vor 6 Jahren |
|
rallytime
|
0d49746de8
Fix some formatting in master config docs
|
vor 6 Jahren |
|
rallytime
|
82e73fe49d
Merge branch '2018.3' into 'fluorine'
|
vor 6 Jahren |
|
Daniel Wallace
|
4c4bb5a489
Merge pull request #49987 from terminalmage/pillar_roots
|
vor 6 Jahren |
|
rallytime
|
f8e73e8ae2
Merge branch '2017.7' into '2018.3'
|
vor 6 Jahren |
|
Erik Johnson
|
58f5fde03c
Make Pillar no longer munge file_roots
|
vor 6 Jahren |
|
rallytime
|
216fd64013
Remove event_publisher_pub_hwm and salt_event_pub_hwm from documentation
|
vor 6 Jahren |
|
rallytime
|
0c8b412556
Merge branch '2018.3' into 'fluorine'
|
vor 6 Jahren |
|
rallytime
|
f7226f400f
Merge branch '2017.7' into '2018.3'
|
vor 6 Jahren |
|
Erik Johnson
|
ea1b53cb6f
Fix incorrect master docs for enable_gpu_grains
|
vor 6 Jahren |
|
Erik Johnson
|
d1b7fb449c
Revert "Update documentation to correctly state enable_gpu_grains default"
|
vor 6 Jahren |
|
rallytime
|
da3a29c680
Merge branch '2018.3' into 'fluorine'
|
vor 6 Jahren |
|
rallytime
|
c3ecefc785
Merge branch '2017.7' into '2018.3'
|
vor 6 Jahren |
|
Mike Place
|
f8c55b85e1
Merge pull request #49184 from ralish/external_nodes_docs
|
vor 6 Jahren |
|
Samuel D. Leslie
|
2fe675cfdd
Update documentation to correctly state enable_gpu_grains default
|
vor 6 Jahren |
|
Samuel D. Leslie
|
2e29b292bf
Remove obsolete documentation on external_nodes setting
|
vor 6 Jahren |
|
rallytime
|
6e6091c3ba
Merge branch '2018.3' into 'fluorine'
|
vor 6 Jahren |
|
rallytime
|
201031fa8a
Merge branch '2017.7' into '2018.3'
|
vor 6 Jahren |
|
Erik Johnson
|
0728b5f8b6
Add note about Python 3.5+ only support for optimization_order
|
vor 6 Jahren |
|
Erik Johnson
|
fbcd142ea2
Add configuration docs for optimization_order config option
|
vor 6 Jahren |
|
rallytime
|
a8b30fed9f
Merge branch '2018.3' into 'develop'
|
vor 6 Jahren |
|
Erik Johnson
|
7dce7cde14
Explictly document the configuration override priority
|
vor 6 Jahren |
