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/11/26 04:56:15 UTC
[incubator-skywalking] 01/01: Merge commit
'5ab2ee3ae8bc58694eb0a74a29ca3735fb63969d' into mysql-style
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch mysql-style
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 33d375a9d190905a2347c3f5817d1f4c0a561922
Merge: df3e165 5ab2ee3
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Nov 26 12:55:58 2018 +0800
Merge commit '5ab2ee3ae8bc58694eb0a74a29ca3735fb63969d' into mysql-style
.../concurrent-util-4.x-plugin/pom.xml | 5 ++
.../concurrent/FailureCallbackInterceptor.java | 23 +++-----
.../concurrent/SuccessCallbackInterceptor.java | 21 +++----
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 1 +
.../spring-plugins/resttemplate-4.x-plugin/pom.xml | 6 ++
.../async/ResponseCallBackInterceptor.java | 1 -
.../resttemplate/async/RestExecuteInterceptor.java | 9 ++-
.../resttemplate/async/RestRequestInterceptor.java | 3 +-
.../spring-plugins/spring-commons/pom.xml | 25 +++++----
.../plugin/spring/commons/EnhanceCacheObjects.java | 64 ++++++++++++++++++++++
docs/powered-by.md | 3 +
.../oap/server/library/buffer/BufferFileUtils.java | 3 +
.../server/library/buffer/DataStreamReader.java | 7 ++-
.../server/library/buffer/DataStreamWriter.java | 1 +
.../library/buffer/BufferFileUtilsTestCase.java} | 46 ++++++++--------
.../library-buffer/src/test/resources/log4j2.xml | 2 +-
.../server/receiver/trace/mock/AgentDataMock.java | 16 +++---
17 files changed, 156 insertions(+), 80 deletions(-)