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

Posted to notifications@skywalking.apache.org by ta...@apache.org on 2020/08/21 06:32:21 UTC

[skywalking] 04/04: Merge branch 'master' of github.com:apache/skywalking into slack_alarm

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

tanjian pushed a commit to branch slack_alarm
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 5da6f1076a683155c7e77846855c84a11d89c4a6
Merge: 752da56 79c1c0c
Author: JaredTan95 <ji...@daocloud.io>
AuthorDate: Fri Aug 21 14:31:31 2020 +0800

    Merge branch 'master' of github.com:apache/skywalking into slack_alarm

 .../apm/agent/core/context/tag/Tags.java           |  2 ++
 .../mvc/v4/RestMappingMethodInterceptorTest.java   | 39 ++++++++++++++++++++++
 .../spring/mvc/commons/SpringMVCPluginConfig.java  | 14 ++++++++
 .../interceptor/AbstractMethodInterceptor.java     | 29 ++++++++++++++++
 docs/en/setup/service-agent/java-agent/README.md   |  2 ++
 .../spring-4.3.x-scenario/config/expectedData.yaml |  1 +
 .../spring-4.3.x-scenario/configuration.yml        |  2 ++
 .../resttemplate/RestTemplateController.java       |  2 +-
 8 files changed, 90 insertions(+), 1 deletion(-)