 David Boucha
|
757ef20a31
fix "loose" typo (#33290)
|
8 years ago |
|
Nicole Thomas
|
b7d98da64d
Add auth_tries config option to minion.rst docs (#33287)
|
8 years ago |
|
rallytime
|
fdc877b4dc
Document new master and minion config opts for 2016.3.0
|
8 years ago |
|
Nicole Thomas
|
061851bcbf
Document minion_id_caching config value (#33282)
|
8 years ago |
|
Nicole Thomas
|
59a84a4674
Add docs for new master failback options (#33280)
|
8 years ago |
|
rallytime
|
c8b8d82745
Merge branch '2016.3' into 'develop'
|
8 years ago |
|
rallytime
|
32779b8d71
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Nicole Thomas
|
6fb25a8440
Make note of files that begin with '_' in master.d or minion.d dirs (#33224)
|
8 years ago |
|
Nicole Thomas
|
992c70dc6a
Update the minion.rst file with the new pub_ret option (#32654)
|
8 years ago |
|
rallytime
|
b77993d9a1
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
rallytime
|
fbaeb165c9
Merge branch '2015.5' into merge-2015.8
|
8 years ago |
|
rallytime
|
46a4e8a310
Remove merge conflict line
|
8 years ago |
|
Andrew Pashkin
|
e0d947c707
Document "grains" setting in the minion configuration reference
|
8 years ago |
|
Andrew Pashkin
|
bb4d47dc93
Document "grains" setting in the minion configuration reference (#32528)
|
8 years ago |
|
Nicole Thomas
|
216d9fdc9a
[develop] Merge forward from 2016.3 to develop (#32494)
|
8 years ago |
|
rallytime
|
4f03f2311f
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
rallytime
|
1b04f0ddec
Merge branch '2015.5' into '2015.8'
|
8 years ago |
|
Nicole Thomas
|
29333e533e
Add documentation for some master/minion configs (#32454)
|
8 years ago |
|
rallytime
|
760f479424
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
rallytime
|
d7b4b8b081
Merge branch '2015.5' into '2015.8'
|
8 years ago |
|
rallytime
|
7e642b8381
Audit config.py default types and values - first sweep
|
8 years ago |
|
Jacob Hammons
|
ff8ca5ac2e
Replaces incorrect reference to `master_alive_check` with `master_alive_interval` in docs
|
8 years ago |
|
rallytime
|
f6d9cdc633
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
rallytime
|
7554d0f42d
Merge branch '2015.5' into '2015.8'
|
8 years ago |
|
Erik Johnson
|
1b97e4a3df
Improve state module docs, replace references to state.highstate/state.sls with state.apply
|
8 years ago |
|
rallytime
|
3b74d123af
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Jacob Hammons
|
748acab8b5
Fixed zeromq casing in transport settings
|
8 years ago |
|
Jacob Hammons
|
765a226907
Fixed transport description in minion / master config
|
8 years ago |
|
Jacob Hammons
|
a72dc15720
Assorted doc issues
|
8 years ago |
|
rallytime
|
742d0a6b04
Change all relevant Boron references to 2016.3.0
|
8 years ago |
