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

Posted to commits@skywalking.apache.org by pe...@apache.org on 2018/01/11 14:33:18 UTC

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

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

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

commit 6c11a8404b0a65d20e6642e9dbd42a0b9f8198e9
Merge: 8f49c97 2713b5f
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Thu Jan 11 22:33:14 2018 +0800

    Merge branch 'master' into fix/ScheduledFuture-failsafe

 .../core/plugin/match}/MultiClassNameMatch.java      |  4 +---
 .../jdbc/mysql/define/CallableInstrumentation.java   |  2 +-
 .../jdbc/mysql/define/DriverInstrumentation.java     |  2 +-
 .../define/Mysql5xConnectionInstrumentation.java     |  2 +-
 .../define/PreparedStatementInstrumentation.java     |  2 +-
 .../jdbc/mysql/define/StatementInstrumentation.java  |  2 +-
 .../AbstractJdbc2StatementInstrumentation.java       | 20 ++++++++++++++++----
 .../postgresql/define/ConnectionInstrumentation.java |  9 ++++++---
 8 files changed, 28 insertions(+), 15 deletions(-)

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