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 2020/06/07 08:55:18 UTC
[skywalking] branch meter/prometheus updated (f5c460d -> ca3473e)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch meter/prometheus
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from f5c460d Remove redundant notices.
add f3d907b Remove nacos (#4867)
add ca3473e Merge branch 'master' into meter/prometheus
No new revisions were added by this update.
Summary of changes:
dist-material/release-docs/LICENSE | 2 -
dist-material/release-docs/NOTICE | 38 ----
docs/en/setup/backend/backend-cluster.md | 10 -
docs/en/setup/backend/dynamic-config.md | 25 ---
oap-server/pom.xml | 6 -
oap-server/server-bootstrap/pom.xml | 10 -
.../src/main/resources/application.yml | 18 --
.../cluster-nacos-plugin/pom.xml | 162 ----------------
.../plugin/nacos/ClusterModuleNacosConfig.java | 35 ----
.../plugin/nacos/ClusterModuleNacosProvider.java | 89 ---------
.../cluster/plugin/nacos/NacosCoordinator.java | 78 --------
...alking.oap.server.library.module.ModuleProvider | 19 --
.../nacos/ClusterModuleNacosProviderTest.java | 109 -----------
...ITClusterModuleNacosProviderFunctionalTest.java | 194 -------------------
.../cluster/plugin/nacos/NacosCoordinatorTest.java | 130 -------------
oap-server/server-cluster-plugin/pom.xml | 1 -
.../configuration-nacos/pom.xml | 145 --------------
.../nacos/NacosConfigWatcherRegister.java | 134 -------------
.../nacos/NacosConfigurationProvider.java | 71 -------
.../configuration/nacos/NacosServerSettings.java | 36 ----
...alking.oap.server.library.module.ModuleProvider | 19 --
.../nacos/ITNacosConfigurationTest.java | 116 -----------
.../nacos/NacosConfigWatcherRegisterTest.java | 65 -------
.../nacos/NacosConfigurationTestModule.java | 34 ----
.../nacos/NacosConfigurationTestProvider.java | 94 ---------
...ywalking.oap.server.library.module.ModuleDefine | 20 --
...alking.oap.server.library.module.ModuleProvider | 19 --
.../src/test/resources/application.yml | 35 ----
.../docker-entrypoint-initdb.d/nacos-mysql.sql | 215 ---------------------
oap-server/server-configuration/pom.xml | 1 -
.../known-oap-backend-dependencies-es7.txt | 4 -
.../known-oap-backend-dependencies.txt | 4 -
32 files changed, 1938 deletions(-)
delete mode 100644 oap-server/server-cluster-plugin/cluster-nacos-plugin/pom.xml
delete mode 100644 oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosConfig.java
delete mode 100644 oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProvider.java
delete mode 100644 oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinator.java
delete mode 100644 oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
delete mode 100644 oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProviderTest.java
delete mode 100644 oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ITClusterModuleNacosProviderFunctionalTest.java
delete mode 100644 oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinatorTest.java
delete mode 100644 oap-server/server-configuration/configuration-nacos/pom.xml
delete mode 100644 oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegister.java
delete mode 100644 oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationProvider.java
delete mode 100644 oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosServerSettings.java
delete mode 100644 oap-server/server-configuration/configuration-nacos/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
delete mode 100644 oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/ITNacosConfigurationTest.java
delete mode 100644 oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegisterTest.java
delete mode 100644 oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestModule.java
delete mode 100644 oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestProvider.java
delete mode 100644 oap-server/server-configuration/configuration-nacos/src/test/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
delete mode 100644 oap-server/server-configuration/configuration-nacos/src/test/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
delete mode 100755 oap-server/server-configuration/configuration-nacos/src/test/resources/application.yml
delete mode 100644 oap-server/server-configuration/configuration-nacos/src/test/resources/docker/docker-entrypoint-initdb.d/nacos-mysql.sql