Merge pull request #28833 from basepi/increase.gather_job_timeout.8647

[2015.5] Increase the default gather_job_timeout
This commit is contained in:
Colton Myers 2015-11-12 12:31:58 -07:00
commit eff811a0ad

View file

@ -607,7 +607,7 @@ DEFAULT_MASTER_OPTS = {
'keysize': 2048,
'transport': 'zeromq',
'enumerate_proxy_minions': False,
'gather_job_timeout': 5,
'gather_job_timeout': 10,
'syndic_event_forward_timeout': 0.5,
'syndic_max_event_process_time': 0.5,
'syndic_jid_forward_cache_hwm': 100,