tree 86cdfc9c1e3c6859059ddb20813b4c895a67e53e
parent 310e3a422d999554eadcb7fbf213b96560bab4cb
parent 42bb9095acc2b55dd0fbdb2a749111bc2fb99869
author David Ostrovsky <david@ostrovsky.org> 1608736883 +0100
committer David Ostrovsky <david@ostrovsky.org> 1608736883 +0100

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Set version to 3.1.12-SNAPSHOT
  Set version to 3.1.11
  Fix httpcore dependency needed by httpclient
  Revert "Add support for Elasticsearch version 7.9.*"
  Revert "Add support for Elasticsearch version 7.10.*"

Change-Id: I333a2434d66df525aa85687d9cc0134e7a398c21