tree fa9060edb19dcb176b273af80552f4c3581e25e2
parent 639749e2bda992ef633fff1d174386fd420bfc00
parent 30ad2707c6fa43b5804db3de4529c8b87886e8ba
author Luca Milanesio <luca.milanesio@gmail.com> 1700702269 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> 1700702269 +0000

Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Ignore refs/multi-site/version on global-refdb in replication filter
  Fix Java 8 build and avoid Optional.isEmpty()
  Remove the websession-flatfile plugin configuration

Change-Id: Ifbe6c82a93cbbb52f57cdb0867c5c05f3ded05aa