 rallytime
|
da574e5b03
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Bo Maryniuk
|
419819e92a
Add documentation about thin-min configuration
|
8 years ago |
|
Yoram Hekma
|
308d542742
Update doc to reflect the version where 'none' was added as a pillar_source_merging_strategy
|
8 years ago |
|
Bo Maryniuk
|
a441b35588
Add documentation about Salt Thin configuration
|
8 years ago |
|
Mike Place
|
4956d7d5a3
Merge branch '2016.3' into 2016_3_develop
|
8 years ago |
|
rallytime
|
d5bbd91c14
Merge branch '2016.3' into 'carbon'
|
8 years ago |
|
Nicole Thomas
|
5548ed771d
Back-port #36435 to 2016.3 (#36532)
|
8 years ago |
|
rallytime
|
d0ec4ead2a
Merge branch '2016.3' into 'carbon'
|
8 years ago |
|
Erik Johnson
|
cc9d41fb0e
Change items in minionfs blacklist/whitelist example
|
8 years ago |
|
Yoram Hekma
|
ded8ad43ec
Update on doc
|
8 years ago |
|
Yoram Hekma
|
1f354783e7
Capitalisation
|
8 years ago |
|
Yoram Hekma
|
6becc0d1e7
Updated documentation
|
8 years ago |
|
Erik Johnson
|
37c48472d6
Add documentation for fileserver_list_cache_time
|
8 years ago |
|
rallytime
|
82e9cb748f
Merge branch '2016.3' into 'develop'
|
8 years ago |
|
Nicole Thomas
|
96792663da
Add engines to list of extension module options in master config docs (#35864)
|
8 years ago |
|
rallytime
|
b80ef26cf2
Merge branch '2016.3' into 'develop'
|
8 years ago |
|
rallytime
|
1d819d7cc2
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Nicole Thomas
|
f7f8221169
Everything in the sample master config file should be commented out (#35611)
|
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 |
|
Erik Johnson
|
d54d14c6cf
Add documentation for runner_returns config option
|
8 years ago |
|
Mike Place
|
404833e51b
Merge pull request #34969 from fdamstra/Add_multi_event_return
|
8 years ago |
|
Fred Damstra
|
8b56d76490
Adds support for multiple server-side event_returners.
|
8 years ago |
|
rallytime
|
d679c09e65
Merge branch '2016.3' into 'develop'
|
8 years ago |
|
rallytime
|
7d106c78f0
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
rallytime
|
9c803d05a5
Add output_file option to master config docs
|
8 years ago |
|
Denys Havrysh
|
a8b79e8dc1
`event_return_*` master opts: update doc and config examples
|
8 years ago |
|
rallytime
|
49f40e9d99
Merge branch '2016.3' into 'develop'
|
8 years ago |
|
rallytime
|
f734afd0b0
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Erik Johnson
|
ae38c874da
Add a bunch of documentation on getting files from other environments (#34560)
|
8 years ago |
