This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch dynamic-logging
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 79ebead Merge branch 'master' into dynamic-logging
add ffc69dc ES storage support set order of index template. (#7378)
add bdf161d Merge branch 'master' into dynamic-logging
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 2 +-
docs/en/setup/backend/backend-storage.md | 1 +
docs/en/setup/backend/configuration-vocabulary.md | 2 ++
oap-server/server-bootstrap/src/main/resources/application.yml | 3 +++
.../server/library/client/elasticsearch/ElasticSearchClient.java | 3 ++-
.../server/library/client/elasticsearch/ITElasticSearchClient.java | 4 ++--
.../plugin/elasticsearch/StorageModuleElasticsearchConfig.java | 6 ++++++
.../storage/plugin/elasticsearch/base/StorageEsInstaller.java | 2 +-
.../storage/plugin/elasticsearch7/client/ElasticSearch7Client.java | 5 +++--
9 files changed, 21 insertions(+), 7 deletions(-)