summaryrefslogtreecommitdiff
path: root/zuul/merger
Commit message (Expand)AuthorAgeFilesLines
* Git driverFabien Boucher2017-12-153-0/+39
* Add command socket support to zuul-mergerPaul Belanger2017-12-061-0/+29
* Add support for override-checkout, deprecate override-branchJames E. Blair2017-10-301-1/+3
* Add git timeoutJames E. Blair2017-10-101-21/+44
* Create git_http_low_speed_limit / git_http_low_speed_timePaul Belanger2017-10-052-11/+17
* Add git timeout for HTTP(S) operationsPaul Belanger2017-10-051-3/+7
* Fix typo with merger.getRepoStatePaul Belanger2017-09-121-1/+1
* Abort reconfiguration when cat jobs failJames E. Blair2017-09-121-3/+3
* Merge "Clean up obsolete TODO for _setGitSsh()" into feature/zuulv3Zuul2017-09-091-4/+0
|\
| * Clean up obsolete TODO for _setGitSsh()Jeremy Stanley2017-09-051-4/+0
* | Use 'git checkout' when checking out a tagJames E. Blair2017-09-081-1/+4
|/
* Ensure ref-updated jobs run with their refJames E. Blair2017-08-023-8/+81
* Remove zuul_url from merger configTobias Henkel2017-07-312-7/+3
* Remove refspecJames E. Blair2017-07-211-9/+10
* Add support for zuul.d configuration splitTristan Cacqueray2017-07-103-13/+25
* config: refactor config get defaultTristan Cacqueray2017-06-172-46/+14
* Add ssl support to gearman / gearman_serverPaul Belanger2017-06-142-2/+26
* Fix git ssh env in mergerJames E. Blair2017-06-091-44/+36
* Actually check out the branch in the jobdirJames E. Blair2017-05-311-2/+4
* Update the merger recent dict when saving the repo stateJames E. Blair2017-05-311-7/+9
* Add LoggerAdapter for executor jobsJames E. Blair2017-05-261-7/+14
* Check out the appropriate branch in executorJames E. Blair2017-05-251-0/+4
* Use the executor cached repos more oftenJames E. Blair2017-05-251-12/+39
* Return resulting commits from mergerJames E. Blair2017-05-252-6/+15
* Use previously stored repo state on executorJames E. Blair2017-05-242-1/+37
* Store initial repo state in the mergerJames E. Blair2017-05-243-30/+38
* Merge "Remove unused merger:update task" into feature/zuulv3Jenkins2017-05-202-17/+0
|\
| * Remove unused merger:update taskJesse Keating2017-05-172-17/+0
* | Encoding changes in tests for py3Clint Byrum2017-05-191-1/+1
* | py3 Changes in __del__ for gitpythonClint Byrum2017-05-191-7/+6
* | Use gear Text interfaceClint Byrum2017-05-192-2/+2
|/
* Use connection to qualify projects in mergerJames E. Blair2017-04-273-45/+57
* Perform pre-launch merge checksK Jonathan Harker2017-04-041-1/+4
* Merge "Merge branch 'master' into feature/zuulv3" into feature/zuulv3Jenkins2017-03-062-1/+14
|\
| * Merge branch 'master' into feature/zuulv3Joshua Hesketh2017-03-062-1/+14
| |\
| | * Fix setting of GIT_SSH for timer merge jobsEvgeny Antyshev2017-02-083-11/+15
| | * Merger: fully update repo on repo updateJames E. Blair2016-10-221-1/+1
* | | Catch gear.InterruptedErrorJames E. Blair2017-03-031-0/+2
|/ /
* | Fix race in sshwrapperJoshua Hesketh2017-02-211-48/+39
* | Merge "Split merger and launcher git roots" into feature/zuulv3Jenkins2017-02-151-1/+1
|\ \
| * | Split merger and launcher git rootsJames E. Blair2017-02-091-1/+1
* | | Reset merger repo when performing an updateJames E. Blair2017-02-141-1/+1
|/ /
* | Add some gearman related debuggingJames E. Blair2017-02-061-1/+1
* | Use playbooks defined in reposJames E. Blair2017-02-031-0/+10
* | Merge branch 'master' into feature/zuulv3Joshua Hesketh2016-09-201-3/+14
|\ \ | |/
| * Handle non-valid HEADArie2016-08-311-2/+6
| * Cloner: correct fetch on pre-1.9 git2.5.0James E. Blair2016-07-291-0/+7
| * Use fetch instead of update in mergerJames E. Blair2016-07-141-1/+1
* | Add dynamic reconfigurationJames E. Blair2016-07-183-11/+28
* | Merge branch 'master' into v3_mergeJoshua Hesketh2016-07-142-2/+2
|\ \ | |/
View Lorry Controller Status