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

Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/12/06 09:26:46 UTC

[incubator-skywalking] 02/02: Merge branch 'master' of https://github.com/apache/incubator-skywalking

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

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

commit 790f91d1b2aabc9cbafa10f5c990c21adc900d42
Merge: e9b46bc 3f2fb8d
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Dec 6 17:25:45 2018 +0800

    Merge branch 'master' of https://github.com/apache/incubator-skywalking

 apm-sniffer/apm-test-tools/pom.xml                 |  9 ++++--
 .../apm-trace-ignore-plugin.config                 |  2 +-
 .../optional-plugins/trace-ignore-plugin/pom.xml   | 16 +++++++++-
 .../trace/ignore/conf/IgnoreConfigInitializer.java | 34 ++++++++++------------
 .../apm/plugin/trace/ignore/TraceIgnoreTest.java   | 26 ++++++++++++-----
 .../v6/grpc/TraceSegmentReportServiceHandler.java  |  2 --
 6 files changed, 57 insertions(+), 32 deletions(-)