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:06 UTC

[incubator-skywalking] branch fix/readme updated (239009c -> f2e3af9)

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

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


    from 239009c  update readme.
     add c9dbd6d  fix the sql tag value is null when client using Statement.execute(sql) method
     add 2cfc35d  Merge branch 'master' into fix/mysql-plugin-issue
     add 6835225  fix compile failed issue
     add 2fa0a41  Merge pull request #663 from ascrutae/fix/mysql-plugin-issue
     add 73d662b  add relocation config of org.apache.http and org.apache.commons 's package
     add a4b49b2  fix issue that the intercept class and the enhance class package name of the trace annotation plugin  is incorrect
     add 1a593ab  Merge pull request #669 from ascrutae/fix/annotation-activation-plugin-issue
     add 7f98cf9  Merge branch 'master' into fix/shade-pacage-incorrect
     add 419acc1  Merge pull request #668 from ascrutae/fix/shade-pacage-incorrect
     new f2e3af9  Merge branch 'master' into fix/readme

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:
 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(-)
 copy apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/{StatementExecuteMethodsInterceptor.java => PreparedStatementExecuteMethodsInterceptor.java} (87%)

-- 
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 fix/readme

Posted by wu...@apache.org.
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>.