tree 44a099a86570a902914d5e8d404e03c0d65b95af
parent 049179c6e0dc58fd31d953427b5bae855e81b8f7
parent 19f7e67c86a8eca1dcca72c76ab7076451dd649c
author Marco Miller <marco.miller@ericsson.com> 1624894269 -0400
committer Marco Miller <marco.miller@ericsson.com> 1624894269 -0400

Merge branch 'stable-3.4'

* stable-3.4:
  HostKeyProvider: Set algorithm to rsa for legacy host key
  Honour {httpd,sshd}.gracefulStopTimeout in gerrit.sh
  SSH transport: Re-enable weak kex algorithms
  Elasticsearch: Discontinue EOL version 7.5 support

Change-Id: If0b996cb18b8fa7cc11a6b33d9b3d1fe5cae07bb