 rallytime
|
efb8a8ddf5
Merge branch '2016.3' into '2016.11'
|
8 years ago |
|
David Boucha
|
11863a4bfe
add examples of default minion returners
|
8 years ago |
|
Dmitry Kuzmenko
|
0c607ccaec
An example configuration for TLS/SSL. (#37859)
|
8 years ago |
|
rallytime
|
7f955bda0a
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Nicole Thomas
|
7cdbc546f1
Back-port #36062 to 2015.8 (#36118)
|
8 years ago |
|
rallytime
|
9828a0dbfa
Comment all lines in the minion config file
|
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 |
|
Mike Place
|
69b44bc6f8
Merge pull request #35500 from rallytime/fix-35068
|
8 years ago |
|
rallytime
|
cface344d6
Add docs for pillar_raise_on_missing option
|
8 years ago |
|
rallytime
|
de4b33f2e1
Merge branch '2016.3' into 'develop'
|
8 years ago |
|
Jeffrey 'jf' Lim
|
c61c8a27e5
Update instructions for getting master fingerprint in conf/minion
|
8 years ago |
|
C. R. Oldham
|
84cc7d67c0
Add documentation for append_minionid_config_dirs.
|
8 years ago |
|
Nicole Thomas
|
08a584b3e5
Merge pull request #33711 from rallytime/merge-develop-3
|
8 years ago |
|
EYJ
|
beea8cc376
Fix millisecond formatting to avoid 1000 as four-digit milliseconds
|
8 years ago |
|
rallytime
|
9220ea0729
Merge branch '2016.3' into 'develop'
|
8 years ago |
|
Jeffrey 'jf' Lim
|
e13986a053
conf/minion: minion supports sha1 hashing as well, so add that in the note
|
8 years ago |
|
Jeffrey 'jf' Lim
|
983309ee5a
conf/minion: attempt at fixing #32460
|
8 years ago |
|
Jeffrey 'jf' Lim
|
ab9639f393
conf/{master,minion}: remove trailing spaces
|
8 years ago |
|
rallytime
|
a5e0141eda
Merge branch '2015.8' into '2106.3'
|
8 years ago |
|
rallytime
|
03b0c97520
Merge branch '2015.5' into '2015.8'
|
8 years ago |
|
rallytime
|
b0a9f4181f
Add docs for the syndic_finger config
|
8 years ago |
|
Nicole Thomas
|
336fbb03bc
[develop] Merge forward from 2016.3 to develop (#33408)
|
8 years ago |
|
rallytime
|
35ad788470
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
C. R. Oldham
|
11a25255ec
Bp 28467 calm mine (#33327)
|
8 years ago |
|
C. R. Oldham
|
d375c1fe37
Add docs for mine_functions config var (#33326)
|
8 years ago |
|
Justin Findlay
|
089c1a2513
remove redundant, incorrect sudo_runas config documentation (#33318)
|
8 years ago |
|
rallytime
|
7bf9f5d0f5
Merge branch '2016.3' into 'develop'
|
8 years ago |
|
rallytime
|
779f31cc20
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
rallytime
|
1c43a62f85
Merge branch '2015.5' into '2015.8'
|
8 years ago |
|
Nicole Thomas
|
9b42a05519
Added some more docs for master and minion config settings (#33292)
|
8 years ago |
