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 89d033354f3b871f05f6ba820619a5e56c1d7856 Merge: f1dfe6e 91ffae2 Author: Gao Hongtao <[email protected]> AuthorDate: Wed May 15 17:32:38 2019 +0800 Merge branch 'master' of https://github.com/apache/skywalking apm-dist/release-docs/LICENSE | 2 + apm-dist/release-docs/NOTICE | 38 ++++++ .../release-docs/licenses/LICENSE-fastjson.txt | 13 ++ docker/README.md | 12 -- 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 ++++---- 18 files changed, 691 insertions(+), 36 deletions(-) diff --cc docker/README.md index 15d4a2c,15d4a2c..0000000 deleted file mode 100644,100644 --- a/docker/README.md +++ /dev/null @@@ -1,12 -1,12 +1,0 @@@ -- --# Build all images -- --```shell --make build --``` -- --# Run skywalking by docker-compose -- --```shell --docker-compose up --```
