| commit | 4b3f9c6b62d6a5d235cddc3c83aa72ae629be4e7 | [log] [tgz] |
|---|---|---|
| author | Marco Miller <marco.miller@ericsson.com> | Mon Jun 28 11:31:09 2021 -0400 |
| committer | Marco Miller <marco.miller@ericsson.com> | Mon Jun 28 11:31:09 2021 -0400 |
| tree | 44a099a86570a902914d5e8d404e03c0d65b95af | |
| parent | 049179c6e0dc58fd31d953427b5bae855e81b8f7 [diff] | |
| parent | 19f7e67c86a8eca1dcca72c76ab7076451dd649c [diff] |
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