tree ef157e09bb91ebd2fbf5957c9f0007c44dbe6ea2
parent 7bdf44e9d311dbeb85cea0a873fef21f8abcbb69
parent 8a3e31fc6056e64ad8fa8587d21fc80f9da9201a
author Marco Miller <marco.miller@ericsson.com> 1624890786 -0400
committer Marco Miller <marco.miller@ericsson.com> 1624890786 -0400

Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Honour {httpd,sshd}.gracefulStopTimeout in gerrit.sh
  Elasticsearch: Discontinue EOL version 7.5 support

Change-Id: I9f8ee9c5a764c651e3d5b8e2607d7a5f50cb7216