tree 2f2e30266472d310990afda3a73188a6a7f1f438
parent 574e8990518e70074228d779ac487475a54bb3ea
parent 35aaca1efb68016ac15fdc41f6479381fa201410
author Matthias Sohn <matthias.sohn@sap.com> 1630506673 +0200
committer Matthias Sohn <matthias.sohn@sap.com> 1630506673 +0200

Merge branch 'master' into stable-5.13

* master:
  GitServlet: allow to override default error handlers
  Silence API error for new interface method ProtocolV2Hook#onObjectInfo
  transport: add object-info capability
  Ignore IllegalStateException if JVM is already shutting down
  Update orbit to R20210825222808 for 2021-09
  RevWalk: getMergedInto's result is wrong on the second call

Change-Id: I007882d0c663e406d8845cc807f3792ae7673230