[incubator-skywalking] 01/01: Merge branch 'master' into wu-sheng-patch-1

2018-07-11 Thread wusheng 
This is an automated email from the ASF dual-hosted git repository.

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

commit 51bf559392b8efd45258444ef214034d828497f2
Merge: e355d42 e0979ce
Author: 吴晟 Wu Sheng 
AuthorDate: Wed Jul 11 15:54:04 2018 -0700

Merge branch 'master' into wu-sheng-patch-1

 apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml   |  2 +-
 apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml   |  2 +-
 apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml |  2 +-
 apm-application-toolkit/apm-toolkit-opentracing/pom.xml |  2 +-
 apm-application-toolkit/apm-toolkit-trace/pom.xml   |  2 +-
 apm-application-toolkit/pom.xml |  2 +-
 apm-checkstyle/pom.xml  |  2 +-
 .../agent-grpc/agent-grpc-define/pom.xml|  5 ++---
 .../agent-grpc/agent-grpc-provider/pom.xml  |  5 ++---
 apm-collector/apm-collector-agent/agent-grpc/pom.xml|  5 ++---
 .../agent-jetty/agent-jetty-define/pom.xml  |  5 ++---
 .../agent-jetty/agent-jetty-provider/pom.xml|  5 ++---
 apm-collector/apm-collector-agent/agent-jetty/pom.xml   |  5 ++---
 apm-collector/apm-collector-agent/pom.xml   |  5 ++---
 .../analysis-alarm/alarm-define/pom.xml |  5 ++---
 .../analysis-alarm/alarm-provider/pom.xml   |  5 ++---
 apm-collector/apm-collector-analysis/analysis-alarm/pom.xml |  5 ++---
 .../analysis-baseline/baseline-computing-define/pom.xml |  5 ++---
 .../analysis-baseline/baseline-computing-provider/pom.xml   |  5 ++---
 .../apm-collector-analysis/analysis-baseline/pom.xml|  5 ++---
 .../apm-collector-analysis/analysis-jvm/jvm-define/pom.xml  |  5 ++---
 .../analysis-jvm/jvm-provider/pom.xml   |  5 ++---
 apm-collector/apm-collector-analysis/analysis-jvm/pom.xml   |  5 ++---
 .../analysis-metric/metric-define/pom.xml   |  5 ++---
 .../analysis-metric/metric-provider/pom.xml |  5 ++---
 .../apm-collector-analysis/analysis-metric/pom.xml  |  5 ++---
 .../apm-collector-analysis/analysis-register/pom.xml|  5 ++---
 .../analysis-register/register-define/pom.xml   |  5 ++---
 .../analysis-register/register-provider/pom.xml |  5 ++---
 .../apm-collector-analysis/analysis-segment-parser/pom.xml  |  5 ++---
 .../analysis-segment-parser/segment-parser-define/pom.xml   |  5 ++---
 .../analysis-segment-parser/segment-parser-provider/pom.xml |  5 ++---
 .../apm-collector-analysis/analysis-worker-model/pom.xml|  5 ++---
 apm-collector/apm-collector-analysis/pom.xml|  5 ++---
 apm-collector/apm-collector-boot/pom.xml|  5 ++---
 .../collector-cache-caffeine-provider/pom.xml   |  6 ++
 .../apm-collector-cache/collector-cache-define/pom.xml  |  5 ++---
 .../collector-cache-guava-provider/pom.xml  |  5 ++---
 apm-collector/apm-collector-cache/pom.xml   |  5 ++---
 .../apm-collector-cluster/collector-cluster-define/pom.xml  |  5 ++---
 .../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 ++---
 .../apm-collector-component/client-component/pom.xml|  5 ++---
 apm-collector/apm-collector-component/pom.xml   |  5 ++---
 .../apm-collector-component/server-component/pom.xml|  5 ++---
 .../collector-configuration-define/pom.xml  |  5 ++---
 .../collector-configuration-provider/pom.xml|  5 ++---
 apm-collector/apm-collector-configuration/pom.xml   |  5 ++---
 apm-collector/apm-collector-core/pom.xml|  5 ++---
 .../collector-grpc-manager-define/pom.xml   |  5 ++---
 .../collector-grpc-manager-provider/pom.xml |  5 ++---
 apm-collector/apm-collector-grpc-manager/pom.xml|  5 ++---
 apm-collector/apm-collector-instrument/pom.xml  |  8 +++-
 .../collector-jetty-manager-define/pom.xml  |  5 ++---
 .../collector-jetty-manager-provider/pom.xml|  5 ++---
 apm-collector/apm-collector-jetty-manager/pom.xml   |  5 ++---
 .../apm-collector-naming/collector-naming-define/pom.xml|  5 ++---
 .../collector-naming-jetty-provider/pom.xml |  5 ++---
 apm-collector/apm-collector-naming/pom.xml  |  5 ++---
 .../apm-collector-remote/collector-remote-define/pom.xml|  5 ++---
 .../collector-remote-grpc-provider/pom.xml  |  5 ++---
 .../collector-remote-kafka-provider/pom.xml |  5 ++---

[incubator-skywalking] 01/01: Merge branch 'master' into wu-sheng-patch-1

2018-07-11 Thread wusheng 
This is an automated email from the ASF dual-hosted git repository.

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

commit e355d42430dbea195eddd0ec4279719d13ea9672
Merge: 3ecfeca ccf5ef4
Author: 吴晟 Wu Sheng 
AuthorDate: Wed Jul 11 11:45:30 2018 -0700

Merge branch 'master' into wu-sheng-patch-1

 NOTICE   |  3 ++-
 apm-dist/release-docs/NOTICE | 10 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

[incubator-skywalking] 01/01: Merge branch 'master' into wu-sheng-patch-1

2018-04-10 Thread wusheng 
This is an automated email from the ASF dual-hosted git repository.

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

commit 3f371103521cd0ebe2331b84bbaf8e54a8a9817f
Merge: 24cb483 8dda60e
Author: 吴晟 Wu Sheng 
AuthorDate: Wed Apr 11 11:43:12 2018 +0800

Merge branch 'master' into wu-sheng-patch-1

 docs/README_ZH.md   | 14 +---
 docs/cn/Application-toolkit-CN.md   |  4 +--
 docs/cn/Application-toolkit-logback-1.x-CN.md   |  2 +-
 docs/cn/Application-toolkit-trace-CN.md |  2 +-
 docs/cn/Deploy-backend-in-standalone-mode-CN.md | 18 +++---
 docs/cn/Deploy-skywalking-agent-CN.md   |  2 +-
 docs/cn/Direct-uplink-CN.md | 31 +
 docs/cn/FAQ/Kafka-plugin-CN.md  |  2 +-
 docs/cn/Namespace-CN.md | 37 
 docs/cn/Setting-override-CN.md  | 34 +++
 docs/cn/TLS-CN.md   | 44 
 docs/cn/Token-auth-CN.md| 45 +
 docs/en/Application-toolkit-log4j-1.x.md|  2 +-
 docs/en/Application-toolkit-log4j-2.x.md|  2 +-
 docs/en/Application-toolkit-logback-1.x.md  |  4 +--
 docs/en/Applicaton-toolkit.md   |  4 +--
 docs/en/Deploy-backend-in-standalone-mode.md|  4 +--
 docs/en/Deploy-skywalking-agent.md  |  4 +--
 docs/en/Direct-uplink.md|  2 +-
 docs/en/FAQ/kafka-plugin.md |  2 +-
 docs/en/TLS.md  |  2 +-
 21 files changed, 225 insertions(+), 36 deletions(-)

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