zuul/zuul
Code Issues Proposed changes

Merge "Split merger and launcher git roots" into feature/zuulv3

Browse Source
This commit is contained in:
Jenkins
2017-02-15 21:47:55 +00:00
committed by Gerrit Code Review
parent 5d44129803 8c1be53819
commit 1f8ee7f550
7 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zuul/merger/server.py
View File

@@ -32,7 +32,7 @@ class MergeServer(object):
if self.config.has_option('merger', 'git_dir'):
merge_root = self.config.get('merger', 'git_dir')
else:
merge_root = '/var/lib/zuul/git'
merge_root = '/var/lib/zuul/merger-git'
if self.config.has_option('merger', 'git_user_email'):
merge_email = self.config.get('merger', 'git_user_email')