zuul
/
zuul
Code Issues Proposed changes

Merge "Fix quickstart gating, Add git name and email to executor"

This commit is contained in:
Zuul 2020-06-08 18:03:17 +00:00 committed by Gerrit Code Review
parent fe03022787 ab08ae3c7a
commit b298df683a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zuul/merger/server.py
View File

@ -50,8 +50,10 @@ class BaseMergeServer(metaclass=ABCMeta):
def __init__(self, config, component, connections=None):
self.connections = connections or {}
self.merge_email = get_default(config, 'merger', 'git_user_email')
self.merge_name = get_default(config, 'merger', 'git_user_name')
self.merge_email = get_default(config, 'merger', 'git_user_email',
'zuul.merger.default@example.com')
self.merge_name = get_default(config, 'merger', 'git_user_name',
'Zuul Merger Default')
self.merge_speed_limit = get_default(
config, 'merger', 'git_http_low_speed_limit', '1000')
self.merge_speed_time = get_default(