tree 00d0a77a4dd8afb8484e21b56cbd336865f85ed2
parent e121d24d16823ad8cf4c370cc95adab242023c55
parent 23efffb9d12b03dd1642d16098e45e439e937b5d
author Marco Miller <marco.miller@ericsson.com> 1570467360 -0400
committer Marco Miller <marco.miller@ericsson.com> 1570467425 -0400

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Add support for Elasticsearch version 7.4.*

Change-Id: Ic9bc8e16fc40e03e115c4a649fc3b4026ce1069a