tree dea7ca864cd25434de1370cad1ec5bfe30ee7291
parent 6807661d39a43909c946e4dc1359db13dcf9d24a
parent fc60efff0d92b25c21be5fdbe84c17670ccb0288
author Matthias Sohn <matthias.sohn@sap.com> 1637772542 +0100
committer Matthias Sohn <matthias.sohn@sap.com> 1637772542 +0100

Merge branch 'master' into stable-6.0

* master:
  Add 4.22 target platform for 2021-12
  Update Orbit to R20211122181901 for 2021-12
  AppServer: fix keystore used to setup test SSL context factory
  [6.0 API cleanup] Public interface for PackLock
  [6.0 API cleanup] StoredObjectRepresentationNotAvailableException
  RepoCommand: Do not wrap GitApiExceptions in GitApiExceptions
  Set JSch global config values only if not set already
  Better git system config finding
  [6.0 API cleanup] CancelledException vs. CanceledException
  Javadoc fixes
  Better git system config finding
  HttpClientConnectionTest: organize imports
  Update Jetty to 10.0.6
  Fix missing @since 6.0 tag
  Support commit.template config property
  DFS block cache: harden against race over ref locks.

Change-Id: Id9814d92eb40b2ba63c5e753a86a4809826e7c81