 rallytime
|
c8b5d390b5
Merge branch '2016.3' into '2016.11'
|
7 years ago |
|
C. R. Oldham
|
e4aef54c73
Add special token to insert the minion id into the default_include path
|
7 years ago |
|
rallytime
|
65b239664e
Restore ipv6 connectivity and "master: <ip>:<port>" support
|
7 years ago |
|
rallytime
|
b4366103a6
Merge branch '2016.11' into 'develop'
|
7 years ago |
|
Erik Johnson
|
862a3ec309
Different default value in example for pillarenv
|
7 years ago |
|
Erik Johnson
|
2db0f2af4d
Add versionadded for pillarenv_from_saltenv
|
7 years ago |
|
rallytime
|
7b9b3f700d
Merge branch '2016.3' into '2016.11'
|
7 years ago |
|
Daniel Wallace
|
d332b33c8a
add extmod_blacklist to make it easier to remove modules
|
7 years ago |
|
Ivan Babrou
|
55965ce505
Autodetect IPv6 connectivity from minion to master
|
7 years ago |
|
Daniel Wallace
|
e6f243e4cd
add note to clean_dynamic_modules
|
7 years ago |
|
Daniel Wallace
|
413ae19592
document extmod_whitelist
|
7 years ago |
|
Mike Place
|
f8d79076f2
Merge pull request #39013 from terminalmage/zh878
|
7 years ago |
|
rallytime
|
88cc195a2a
Merge branch '2016.11' into 'develop'
|
7 years ago |
|
rallytime
|
6504bb6b02
Merge branch '2016.3' into '2016.11'
|
7 years ago |
|
Ivan Babrou
|
6ffeda3ee5
Clarify ipv6 option for minion and inteface for master, closes #39118 (#39131)
|
7 years ago |
|
Erik Johnson
|
dec7cbf9c5
Add documentation on pillar decryption config items
|
7 years ago |
|
rallytime
|
8928436bdd
Merge branch '2016.11' into 'develop'
|
7 years ago |
|
rallytime
|
fdaa5ac1b0
Merge branch '2016.3' into '2016.11'
|
7 years ago |
|
Erik Johnson
|
6b014e53fc
Rename on_demand_pillar to on_demand_ext_pillar
|
7 years ago |
|
Erik Johnson
|
d216f90c63
Document new on_demand_pillar option and add to config template
|
7 years ago |
|
rallytime
|
49f57ba3f1
Merge branch '2016.11' into 'develop'
|
7 years ago |
|
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 |
