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/04/02 08:03:28 UTC

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

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

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

commit 158e553711b4f7ee941efc63a31a41134dcb1599
Merge: 5e3d8d1 3caa08c
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Apr 2 16:03:26 2018 +0800

    Merge branch 'master' into document/advanced

 .../agent-grpc/agent-grpc-define/pom.xml           |   3 +-
 .../agent-grpc/agent-grpc-provider/pom.xml         |   3 +-
 .../apm-collector-agent/agent-grpc/pom.xml         |   4 +-
 .../agent-jetty/agent-jetty-define/pom.xml         |   5 +-
 .../agent-jetty/agent-jetty-provider/pom.xml       |   3 +-
 .../apm-collector-agent/agent-jetty/pom.xml        |   5 +-
 apm-collector/apm-collector-agent/pom.xml          |   3 +-
 .../analysis-alarm/alarm-define/pom.xml            |   4 +-
 .../analysis-alarm/alarm-provider/pom.xml          |   3 +-
 .../apm-collector-analysis/analysis-alarm/pom.xml  |   5 +-
 .../baseline-computing-define/pom.xml              |   4 +-
 .../baseline-computing-provider/pom.xml            |   3 +-
 .../analysis-baseline/pom.xml                      |   5 +-
 .../analysis-jvm/jvm-define/pom.xml                |   5 +-
 .../analysis-jvm/jvm-provider/pom.xml              |   3 +-
 .../apm-collector-analysis/analysis-jvm/pom.xml    |   5 +-
 .../analysis-metric/metric-define/pom.xml          |   4 +-
 .../analysis-metric/metric-provider/pom.xml        |   3 +-
 .../apm-collector-analysis/analysis-metric/pom.xml |   5 +-
 .../analysis-register/pom.xml                      |   5 +-
 .../analysis-register/register-define/pom.xml      |   5 +-
 .../analysis-register/register-provider/pom.xml    |   3 +-
 .../analysis-segment-parser/pom.xml                |   3 +-
 .../segment-parser-define/pom.xml                  |   3 +-
 .../segment-parser-provider/pom.xml                |   3 +-
 .../analysis-worker-model/pom.xml                  |   5 +-
 apm-collector/apm-collector-analysis/pom.xml       |   3 +-
 apm-collector/apm-collector-boot/pom.xml           |   6 +-
 .../collector-cache-define/pom.xml                 |   6 +-
 .../collector-cache-guava-provider/pom.xml         |   6 +-
 apm-collector/apm-collector-cache/pom.xml          |   5 +-
 .../collector-cluster-define/pom.xml               |   4 +-
 .../collector-cluster-redis-provider/pom.xml       |   5 +-
 .../collector-cluster-standalone-provider/pom.xml  |   5 +-
 .../collector-cluster-zookeeper-provider/pom.xml   |   5 +-
 apm-collector/apm-collector-cluster/pom.xml        |   5 +-
 .../client-component/pom.xml                       |   7 +-
 apm-collector/apm-collector-component/pom.xml      |   5 +-
 .../server-component/pom.xml                       |   9 +-
 .../collector-configuration-define/pom.xml         |   6 +-
 .../collector-configuration-provider/pom.xml       |   3 +-
 apm-collector/apm-collector-configuration/pom.xml  |   3 +-
 apm-collector/apm-collector-core/pom.xml           |   7 +-
 .../collector-grpc-manager-define/pom.xml          |   4 +-
 .../collector-grpc-manager-provider/pom.xml        |   3 +-
 apm-collector/apm-collector-grpc-manager/pom.xml   |   5 +-
 apm-collector/apm-collector-instrument/pom.xml     |   8 +-
 .../collector-jetty-manager-define/pom.xml         |   4 +-
 .../collector-jetty-manager-provider/pom.xml       |   5 +-
 apm-collector/apm-collector-jetty-manager/pom.xml  |   5 +-
 .../collector-naming-define/pom.xml                |   6 +-
 .../collector-naming-jetty-provider/pom.xml        |   5 +-
 apm-collector/apm-collector-naming/pom.xml         |   5 +-
 .../collector-remote-define/pom.xml                |   6 +-
 .../collector-remote-grpc-provider/pom.xml         |   3 +-
 .../collector-remote-kafka-provider/pom.xml        |   5 +-
 apm-collector/apm-collector-remote/pom.xml         |   5 +-
 .../collector-storage-define/pom.xml               |   3 +-
 .../collector-storage-es-provider/pom.xml          |   3 +-
 .../collector-storage-h2-provider/pom.xml          |   3 +-
 apm-collector/apm-collector-storage/pom.xml        |   3 +-
 .../apm-collector-ui/collector-ui-define/pom.xml   |   4 +-
 .../apm-collector-ui/collector-ui-graphql/pom.xml  |   4 +-
 .../collector-ui-jetty-provider/pom.xml            |   3 +-
 apm-collector/apm-collector-ui/pom.xml             |   3 +-
 apm-collector/pom.xml                              | 165 ++++++++++++++++++++-
 66 files changed, 313 insertions(+), 139 deletions(-)

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