| commit | 19f7e67c86a8eca1dcca72c76ab7076451dd649c | [log] [tgz] |
|---|---|---|
| author | Marco Miller <marco.miller@ericsson.com> | Mon Jun 28 11:30:30 2021 -0400 |
| committer | Marco Miller <marco.miller@ericsson.com> | Mon Jun 28 11:30:30 2021 -0400 |
| tree | 0ed6812d499fc450bc8be33360e8f4b2a01ab614 | |
| parent | 314c0b0ff1cd2a423314ee7b114ecfdec59b02e0 [diff] | |
| parent | 7da4af0b75a898ea8666628a11e875b6bce89edf [diff] |
Merge branch 'stable-3.3' into stable-3.4
* stable-3.3:
Honour {httpd,sshd}.gracefulStopTimeout in gerrit.sh
Elasticsearch: Discontinue EOL version 7.5 support
Change-Id: I44a4bf79a2a7a3854d7fc0cc7c9261a5ab621aa4