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

Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/03/16 10:33:20 UTC

[incubator-skywalking] 01/01: Merge branch 'master' into sw3_namespace

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

wusheng pushed a commit to branch sw3_namespace
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git

commit 95c77147ab03864db471f940bf8786ef0649922b
Merge: caf48b6 41f41d1
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Mar 16 18:33:17 2018 +0800

    Merge branch 'master' into sw3_namespace

 .../apm/collector/cluster/DataMonitor.java         |  4 ++--
 .../standalone/ClusterStandaloneDataMonitor.java   | 10 +++++---
 .../collector-cluster-zookeeper-provider/pom.xml   |  5 ++++
 .../zookeeper/ClusterModuleZookeeperProvider.java  | 12 ++++++----
 .../cluster/zookeeper/ClusterZKDataMonitor.java    | 26 +++++++++++++-------
 .../configuration/ConfigurationModule.java         |  2 ++
 .../configuration/service/ICollectorConfig.java}   | 27 +++++++--------------
 .../configuration/ConfigurationModuleProvider.java |  6 ++++-
 .../service/CollectorConfigService.java}           | 28 ++++++++--------------
 9 files changed, 63 insertions(+), 57 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
wusheng@apache.org.