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 2017/12/19 22:09:31 UTC
[incubator-skywalking] branch wusheng/add-notice updated (585e59a
-> 62ff02b)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch wusheng/add-notice
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 585e59a Merge branch 'master' into wusheng/add-notice
add e1a7fd5 Update README_ZH.md
add 07ad767 Merge pull request #688 from apache/fix/opentracing-zh-link
add 6f1f4cf Change network protocol for 5.0
add 5319d72 Merge pull request #690 from apache/5.0-network-protocol
add 09b979c Fix npe
add 40df960 Merge pull request #691 from apache/fix/sampling-service-npe
new 62ff02b Merge branch 'master' into wusheng/add-notice
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../grpc/handler/ApplicationRegisterServiceHandler.java | 12 ++++++------
.../handler/ApplicationRegisterServiceHandlerTestCase.java | 10 +++++-----
apm-network/src/main/proto/ApplicationRegisterService.proto | 10 +++++-----
apm-network/src/main/proto/TraceSegmentService.proto | 1 +
.../skywalking/apm/agent/core/context/trace/SpanLayer.java | 8 ++++++--
.../apm/agent/core/dictionary/ApplicationDictionary.java | 12 ++++++------
.../apm/agent/core/remote/AppAndServiceRegisterClient.java | 12 ++++++------
.../skywalking/apm/agent/core/sampling/SamplingService.java | 6 ++++--
.../apm/plugin/jedis/v2/JedisMethodInterceptor.java | 2 +-
.../apm/plugin/jedis/v2/JedisMethodInterceptorTest.java | 2 +-
.../rocketMQ/v4/AbstractMessageConsumeInterceptor.java | 2 +-
.../apm/plugin/rocketMQ/v4/MessageSendInterceptor.java | 2 +-
.../plugin/spymemcached/v2/MemcachedMethodInterceptor.java | 2 +-
.../spymemcached/v2/MemcachedMethodInterceptorTest.java | 2 +-
.../plugin/xmemcached/v2/XMemcachedMethodInterceptor.java | 2 +-
.../xmemcached/v2/XMemcachedMethodInterceptorTest.java | 2 +-
docs/README_ZH.md | 2 +-
17 files changed, 48 insertions(+), 41 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" <co...@skywalking.apache.org>'].
[incubator-skywalking] 01/01: Merge branch 'master' into
wusheng/add-notice
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch wusheng/add-notice
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 62ff02bfa0f38ebbed129f2e786b56407602d5d7
Merge: 585e59a 40df960
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Dec 20 06:09:28 2017 +0800
Merge branch 'master' into wusheng/add-notice
.../grpc/handler/ApplicationRegisterServiceHandler.java | 12 ++++++------
.../handler/ApplicationRegisterServiceHandlerTestCase.java | 10 +++++-----
apm-network/src/main/proto/ApplicationRegisterService.proto | 10 +++++-----
apm-network/src/main/proto/TraceSegmentService.proto | 1 +
.../skywalking/apm/agent/core/context/trace/SpanLayer.java | 8 ++++++--
.../apm/agent/core/dictionary/ApplicationDictionary.java | 12 ++++++------
.../apm/agent/core/remote/AppAndServiceRegisterClient.java | 12 ++++++------
.../skywalking/apm/agent/core/sampling/SamplingService.java | 6 ++++--
.../apm/plugin/jedis/v2/JedisMethodInterceptor.java | 2 +-
.../apm/plugin/jedis/v2/JedisMethodInterceptorTest.java | 2 +-
.../rocketMQ/v4/AbstractMessageConsumeInterceptor.java | 2 +-
.../apm/plugin/rocketMQ/v4/MessageSendInterceptor.java | 2 +-
.../plugin/spymemcached/v2/MemcachedMethodInterceptor.java | 2 +-
.../spymemcached/v2/MemcachedMethodInterceptorTest.java | 2 +-
.../plugin/xmemcached/v2/XMemcachedMethodInterceptor.java | 2 +-
.../xmemcached/v2/XMemcachedMethodInterceptorTest.java | 2 +-
docs/README_ZH.md | 2 +-
17 files changed, 48 insertions(+), 41 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@skywalking.apache.org" <co...@skywalking.apache.org>.