 Erik Johnson
|
42a3652620
Add top file merging docs to the master config file documentation
|
7 years ago |
|
rallytime
|
5b43a252c9
Merge branch '2016.11' into 'develop'
|
7 years ago |
|
rallytime
|
30e8a66fb0
Merge branch '2016.3' into '2016.11'
|
7 years ago |
|
Denys Havrysh
|
51d4707071
DOCS: add links to File State Backups page where necessary (#38735)
|
7 years ago |
|
Yoram Hekma
|
57df3bf148
The `test` option is only valid for the minion, not the master
|
7 years ago |
|
rallytime
|
a2927226ea
Merge branch '2016.11' into 'develop'
|
8 years ago |
|
rallytime
|
efb8a8ddf5
Merge branch '2016.3' into '2016.11'
|
8 years ago |
|
Erik Johnson
|
27253522c8
Improve pillar documentation (#38407)
|
8 years ago |
|
Erik Johnson
|
1fd9c716d9
Add pillarenv_from_saltenv minion config parameter
|
8 years ago |
|
rallytime
|
494a06bee2
Merge branch '2016.11' into 'develop'
|
8 years ago |
|
rallytime
|
513058945c
Merge branch '2016.3' into '2016.11'
|
8 years ago |
|
rallytime
|
4aafa41d22
Remove ":doc:" references from a bunch of doc/* files
|
8 years ago |
|
rallytime
|
9b2bbe77ef
Merge branch '2016.11' into 'develop'
|
8 years ago |
|
Ch3LL
|
e95f88fbe3
add docs for hash_type change to sha256
|
8 years ago |
|
rallytime
|
b3340c3a73
Merge branch '2016.11' into 'develop'
|
8 years ago |
|
Eric Radman
|
3f2e13d1fc
Remove repeated words in docs (#37871)
|
8 years ago |
|
Erik Johnson
|
7c1cfa82e4
Clarify the master_type docs (#37841)
|
8 years ago |
|
Dmitry Kuzmenko
|
6857b9b8b1
Documented new TLS/SSL settings.
|
8 years ago |
|
rallytime
|
5ead1425d7
Merge branch '2016.3' into 'carbon'
|
8 years ago |
|
Jonathan Ballet
|
89b9417605
Documentation rendering fixes (#37543)
|
8 years ago |
|
rallytime
|
c722a18468
Update Carbon versionadded tags to 2016.11.0 in doc/*
|
8 years ago |
|
rallytime
|
a7dda5706e
Merge branch '2016.3' into 'carbon'
|
8 years ago |
|
Justin Findlay
|
478def4923
doc.ref.configuration.minion: add proxy vars
|
8 years ago |
|
Daniel Wallace
|
2a4c9ac4f3
document master_type disable (#37014)
|
8 years ago |
|
rallytime
|
5362e5183e
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Erik Johnson
|
a56bf8bd2d
Update references to future default value change that was reverted (#36924)
|
8 years ago |
|
Erik Johnson
|
e5425f3e8c
Revert change in default value for top_file_merging_strategy (#36922)
|
8 years ago |
|
Erik Johnson
|
58dd0d5cdc
Cleanup for #36222 (#1)
|
8 years ago |
|
C. R. Oldham
|
908234d9ab
Document module whitelisting. Remove FIXME comments for disable_modules and disable_returners as they are definitely implemented. (#35717)
|
8 years ago |
|
Erik Johnson
|
f2f4482fa0
Update top file merging docs to reflect new strategy
|
8 years ago |
