Merge "Use wait for empty update queue before accepting merges"
This commit is contained in:
commit
d97ea8ebda
|
@ -2427,7 +2427,9 @@ class ExecutorServer(object):
|
||||||
'zuul.ExecutorServer',
|
'zuul.ExecutorServer',
|
||||||
'merger',
|
'merger',
|
||||||
self.config,
|
self.config,
|
||||||
self.merger_jobs)
|
self.merger_jobs,
|
||||||
|
worker_class=ExecutorMergeWorker,
|
||||||
|
worker_args=[self])
|
||||||
|
|
||||||
function_name = 'executor:execute'
|
function_name = 'executor:execute'
|
||||||
if self.zone:
|
if self.zone:
|
||||||
|
|
Loading…
Reference in New Issue