 rallytime
|
5004d2fa61
Merge branch '2015.5' into '2015.8'
|
8 years ago |
|
David Boucha
|
757ef20a31
fix "loose" typo (#33290)
|
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 |
|
Nicole Thomas
|
83dee6366c
Back-port #29322 to 2015.8 (#32785)
|
8 years ago |
|
Nicole Thomas
|
992c70dc6a
Update the minion.rst file with the new pub_ret option (#32654)
|
8 years ago |
|
Mike Place
|
422f66b2dc
A configuration option to disable job returns (#32623)
|
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 |
|
Mike Place
|
63133ebbb5
Add docs for master_tries
|
8 years ago |
|
rallytime
|
308aa5fd61
Merge branch '2016.3' into 'develop'
|
8 years ago |
|
Mike Place
|
854d34aa30
Merge pull request #31626 from isbm/isbm-md5-to-sha1-dev
|
8 years ago |
|
Mike Place
|
b0f1846259
Merge pull request #31832 from adelcast/dev/adelcast/disable_master_2
|
8 years ago |
|
Mike Place
|
64ca65954a
Add docs for master_tries
|
8 years ago |
|
Alejandro del Castillo
|
4277ac6d90
add disable option to 'master_type' minion config token
|
8 years ago |
|
rallytime
|
838dc12b77
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Bo Maryniuk
|
373493c13f
Remove SHA1 for SHA256
|
8 years ago |
|
Bo Maryniuk
|
95cb59dec7
Set defalt hash as SHA1 in config and explain why.
|
8 years ago |
|
Bo Maryniuk
|
f276441ae8
Suggest hash SHA256 in the configs as a defaut and explain why.
|
8 years ago |
|
rallytime
|
40cd0ac8fe
Merge branch '2016.3' into 'develop'
|
8 years ago |
|
rallytime
|
3b74d123af
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Jacob Hammons
|
a72dc15720
Assorted doc issues
|
8 years ago |
|
rallytime
|
73d73e80c1
Merge branch '2016.3' into 'develop'
|
8 years ago |
|
Colton Myers
|
076b49a4ca
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3
|
8 years ago |
|
Carson Anderson
|
10f8df2867
cmd is not a valid module name
|
8 years ago |
|
Benjamin Drung
|
bf92c3663b
Fix typo formating -> formatting
|
8 years ago |
|
Jake Davis
|
4cbf49d487
Rename 'pillar_cache' as 'minion_pillar_cache.'
|
8 years ago |
