 rallytime
|
7fd3e8f361
Fix docs about etcd config options and add pillar_opts doc
|
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 |
|
Nicole Thomas
|
4fdb097c01
Update job_cache and keep_jobs docs to be more specific to their behavior (#33328)
|
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 |
|
jacobhammons
|
7e95127467
man pages updated (#33307)
|
8 years ago |
|
rallytime
|
fdc877b4dc
Document new master and minion config opts for 2016.3.0
|
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 |
|
rallytime
|
16c9ce70ad
Merge branch '2016.3' into 'develop'
|
8 years ago |
|
brad-alexander
|
e7f7aa67d9
Add documentation for transport_opts (#32940)
|
8 years ago |
|
rallytime
|
cbf42a8407
Merge branch '2016.3' into 'develop'
|
8 years ago |
|
Colton Myers
|
a9770fef24
Add ssh_use_home_key to master config docs/template
|
8 years ago |
|
Nicole Thomas
|
f9ffcb697a
[2016.3] Merge forward from 2015.8 to 2016.3 (#32784)
|
8 years ago |
|
Denys Havrysh
|
3751a270d7
Document pillar cache options (#32643)
|
8 years ago |
|
Nicole Thomas
|
9942ea9319
[develop] Merge forward from 2016.3 to develop (#32636)
|
8 years ago |
|
rallytime
|
bbec183474
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Erik Johnson
|
ab9da90ced
Revert PR #32480 and apply #32314 with fixes / documentation (#32558)
|
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
|
7f8eb751a0
Merge branch '2016.3' into 'develop'
|
8 years ago |
|
rallytime
|
59b804d230
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Nicole Thomas
|
c53efc3349
Update master config docs
|
8 years ago |
|
rallytime
|
f31f26b5ed
Change some config defaults in the Carbon release
|
8 years ago |
