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/13 22:14:07 UTC

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

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

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

commit f2e3af97dd9a73155a62e2c2fefae60a19d75ab7
Merge: 239009c 419acc1
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Dec 14 06:14:03 2017 +0800

    Merge branch 'master' into fix/readme

 apm-sniffer/apm-agent-core/pom.xml                    | 12 ++++++++++++
 .../plugin/jdbc/mysql/CreateStatementInterceptor.java |  2 +-
 ...> PreparedStatementExecuteMethodsInterceptor.java} | 19 ++++++++-----------
 .../mysql/StatementExecuteMethodsInterceptor.java     | 19 ++++++++++++++-----
 .../jdbc/mysql/define/CallableInstrumentation.java    |  2 +-
 .../define/PreparedStatementInstrumentation.java      |  5 ++---
 .../jdbc/mysql/define/StatementInstrumentation.java   |  1 -
 .../mysql/StatementExecuteMethodsInterceptorTest.java |  5 ++---
 .../define/AbstractJdbc2StatementInstrumentation.java |  4 +---
 .../AutowiredAnnotationProcessorInstrumentation.java  |  2 +-
 .../activation/trace/ActiveSpanTagActivation.java     |  4 ++--
 .../activation/trace/TraceAnnotationActivation.java   |  4 ++--
 12 files changed, 46 insertions(+), 33 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@skywalking.apache.org" <co...@skywalking.apache.org>.