tree ca494ce7ed054736ab66ef2930c6a2c8eb973b92
parent 3c31fe3dfa1f8680ba9132c42726a47a300dd603
parent 336b1a40aabc5d2e584a18d3473dbe295c25ead2
author Marco Miller <marco.miller@ericsson.com> 1585777675 -0400
committer Marco Miller <marco.miller@ericsson.com> 1585777675 -0400

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Elasticsearch: Unharcode localhost for container's

Change-Id: Id798846df3bc48b4266cec545b2ad607a1a4a06b