 rallytime
|
2f74dcf685
Various doc updates to fix warnings in doc build
|
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 |
|
Eric Radman
|
9b5d28df0c
Extend support for pillarenv_from_saltenv to master config
|
7 years ago |
|
rallytime
|
5b43a252c9
Merge branch '2016.11' into 'develop'
|
7 years ago |
|
Yoram Hekma
|
57df3bf148
The `test` option is only valid for the minion, not the master
|
7 years ago |
|
Johannes Löthberg
|
2ac3da8d03
ref/configuration/master: Document ping_on_rotate
|
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 |
|
Dmitry Kuzmenko
|
dad748f57a
Data cache plugin configuration documentation.
|
8 years ago |
|
Mike Place
|
9350808fea
Merge pull request #38361 from rallytime/deprecate-client_acl-client_acl_blacklist
|
8 years ago |
|
rallytime
|
a9f85f0dbe
Remove support for client_acl and client_acl_blacklist
|
8 years ago |
|
rallytime
|
8f80916432
Merge branch '2016.11' into 'develop'
|
8 years ago |
|
rallytime
|
5940db5b3f
Merge branch '2016.3' into '2016.11'
|
8 years ago |
|
rallytime
|
4a62d01577
Add docs for syndic_wait setting
|
8 years ago |
|
Andreas Tsaridas
|
bbadac329c
add doc for master config (#38189)
|
8 years ago |
|
rallytime
|
4998b8d116
Merge branch '2016.11' into 'develop'
|
8 years ago |
|
rallytime
|
9b2bbe77ef
Merge branch '2016.11' into 'develop'
|
8 years ago |
|
rallytime
|
8fd53a4808
Merge branch '2016.3' into '2016.11'
|
8 years ago |
|
Ch3LL
|
e95f88fbe3
add docs for hash_type change to sha256
|
8 years ago |
