You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@skywalking.apache.org by ke...@apache.org on 2020/07/23 03:27:15 UTC

[skywalking] branch jetty_config updated (d4d9bac -> 38edd90)

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a change to branch jetty_config
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from d4d9bac  fix ci.
     add 2c676ea  Add OAP configuration vocabulary documentation. (#5149)
     add 38edd90  Merge branch 'master' into jetty_config

No new revisions were added by this update.

Summary of changes:
 docs/README.md                                     |   1 +
 docs/en/setup/backend/backend-setup.md             |   3 +
 docs/en/setup/backend/backend-storage.md           |  18 +-
 docs/en/setup/backend/configuration-vocabulary.md  | 210 +++++++++++++++++++++
 .../src/main/resources/application.yml             |  13 +-
 .../apollo/ApolloConfigurationCenterSettings.java  |  64 +------
 .../configuration/nacos/NacosServerSettings.java   |   1 -
 .../zookeeper/ZookeeperServerSettings.java         |   8 +-
 .../oap/server/library/server/grpc/GRPCServer.java |   2 +-
 .../receiver/jaeger/JaegerReceiverConfig.java      |   1 -
 .../receiver/zipkin/ZipkinReceiverConfig.java      |   1 -
 .../StorageModuleElasticsearchConfig.java          |   2 -
 .../storage/plugin/jdbc/h2/H2StorageConfig.java    |   2 +-
 13 files changed, 232 insertions(+), 94 deletions(-)
 create mode 100644 docs/en/setup/backend/configuration-vocabulary.md