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 2020/08/08 14:15:16 UTC

[skywalking] 01/01: Merge commit '9b6a4ed28ce957238851cb0a504ff8ad3c74e59b' into tag-query

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

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

commit f24e6a0ef9ac38591ea2470bf72e48660ed3f876
Merge: 20e27ee 9b6a4ed
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sat Aug 8 22:14:53 2020 +0800

    Merge commit '9b6a4ed28ce957238851cb0a504ff8ad3c74e59b' into tag-query

 .github/ISSUE_TEMPLATE                             |  6 +-
 .github/PULL_REQUEST_TEMPLATE                      |  2 +-
 .../plugin/kafka/CallbackAdapterInterceptor.java   |  2 +
 .../apm/plugin/kafka/CallbackInterceptor.java      |  2 +
 .../src/main/resources/component-libraries.yml     |  2 +-
 .../skywalking/e2e/SkyWalkingAnnotations.java      | 39 ++++++++++++-
 .../skywalking/e2e/docker/DockerComposeFile.java   | 40 +++++++++++++
 .../org/apache/skywalking/e2e/utils/Yamls.java     |  9 +++
 .../e2e/docker/DockerComposeFileTest.java          | 66 ++++++++++++++++++++++
 .../src/test/resources}/docker-compose.yml         | 47 +++++++--------
 test/e2e/e2e-test/docker/base-compose.yml          |  8 +++
 .../e2e/e2e-test/docker/cluster/docker-compose.yml |  3 +
 .../docker/cluster/docker-compose.zk.es6.yml       |  2 +
 .../docker/cluster/docker-compose.zk.es7.yml       |  2 +
 .../docker/cluster/docker-compose.zk.influxdb.yml  |  2 +
 .../docker/cluster/docker-compose.zk.mysql.yml     |  2 +
 .../e2e/e2e-test/docker/gateway/docker-compose.yml |  2 +
 .../e2e-test/docker/simple/auth/docker-compose.yml |  1 +
 .../kafka-scenario/config/expectedData.yaml        |  4 +-
 19 files changed, 206 insertions(+), 35 deletions(-)