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

Posted to notifications@skywalking.apache.org by ha...@apache.org on 2019/05/15 09:33:29 UTC

[skywalking] 02/02: Merge branch 'master' into docker/build

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

hanahmily pushed a commit to branch docker/build
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 8993838784b372d50f5b8fa3ed155df4b1fdafcc
Merge: 6103832 89d0333
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Wed May 15 17:32:59 2019 +0800

    Merge branch 'master' into docker/build

 apm-dist/release-docs/LICENSE                      |   2 +
 apm-dist/release-docs/NOTICE                       |  38 ++++++
 .../release-docs/licenses/LICENSE-fastjson.txt     |  13 ++
 docs/en/setup/backend/backend-cluster.md           |  17 ++-
 oap-server/pom.xml                                 |  36 ++++++
 .../cluster-nacos-plugin/pom.xml                   |  71 +++++++++++
 .../plugin/nacos/ClusterModuleNacosConfig.java     |  31 +++++
 .../plugin/nacos/ClusterModuleNacosProvider.java   |  84 +++++++++++++
 .../cluster/plugin/nacos/NacosCoordinator.java     |  79 ++++++++++++
 ...alking.oap.server.library.module.ModuleProvider |  19 +++
 .../nacos/ClusterModuleNacosProviderTest.java      | 106 ++++++++++++++++
 .../cluster/plugin/nacos/NacosCoordinatorTest.java | 134 +++++++++++++++++++++
 oap-server/server-cluster-plugin/pom.xml           |   1 +
 .../server/core/cluster/ServiceQueryException.java |  29 +++++
 oap-server/server-starter/pom.xml                  |   5 +
 .../src/main/assembly/application.yml              |   3 +
 .../src/main/resources/application.yml             |  47 ++++----
 17 files changed, 691 insertions(+), 24 deletions(-)