[skywalking] branch bugfix/event-combine updated (dcb84ca -> 0821fcc)

[wu...@apache.org]

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

wusheng pushed a change to branch bugfix/event-combine
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from dcb84ca  Fix setting wrong field when combining `Event`s
     add 8e59e55  Replace e2e cases to e2e-v2: Event (#7951)
     add 0821fcc  Merge branch 'master' into bugfix/event-combine

No new revisions were added by this update.

Summary of changes:
 .github/workflows/e2e.event.yaml                       | 10 +++++++---
 CHANGES.md                                             |  1 +
 .../cases/event/es/docker-compose.yml}                 |  9 ++++++---
 test/e2e-v2/cases/{vm/zabbix => event/es}/e2e.yaml     |  4 +---
 .../e2e-v2/cases/event/event-cases.yaml                | 18 ++++++------------
 .../event => e2e-v2/cases/event/expected}/events.yml   | 17 ++++++++++++-----
 .../e2e-v2/cases/event/expected/report-event.yml       |  4 +---
 .../docker => e2e-v2/cases/event/h2}/Dockerfile.h2     |  0
 .../cases/event/h2/docker-compose.yml}                 | 11 ++++++++---
 test/e2e-v2/cases/{vm/zabbix => event/h2}/e2e.yaml     |  4 +---
 .../cases/event/influxdb/docker-compose.yml}           |  7 +++++--
 .../cases/{vm/zabbix => event/influxdb}/e2e.yaml       |  4 +---
 .../cases/event/mysql/docker-compose.yml}              | 11 ++++++-----
 test/e2e-v2/cases/{vm/zabbix => event/mysql}/e2e.yaml  |  4 +---
 14 files changed, 56 insertions(+), 48 deletions(-)
 copy test/{e2e/e2e-test/docker/profile/docker-compose.es.yml => e2e-v2/cases/event/es/docker-compose.yml} (89%)
 copy test/e2e-v2/cases/{vm/zabbix => event/es}/e2e.yaml (80%)
 copy oap-server/server-configuration/configuration-apollo/src/test/resources/application.yml => test/e2e-v2/cases/event/event-cases.yaml (56%)
 mode change 100755 => 100644
 copy test/{e2e/e2e-test/src/test/resources/expected/event => e2e-v2/cases/event/expected}/events.yml (79%)
 copy lombok.config => test/e2e-v2/cases/event/expected/report-event.yml (91%)
 copy test/{e2e/e2e-test/docker => e2e-v2/cases/event/h2}/Dockerfile.h2 (100%)
 copy test/{e2e/e2e-test/docker/profile/docker-compose.h2.yml => e2e-v2/cases/event/h2/docker-compose.yml} (89%)
 copy test/e2e-v2/cases/{vm/zabbix => event/h2}/e2e.yaml (80%)
 copy test/{e2e/e2e-test/docker/profile/docker-compose.influxdb.yml => e2e-v2/cases/event/influxdb/docker-compose.yml} (91%)
 copy test/e2e-v2/cases/{vm/zabbix => event/influxdb}/e2e.yaml (80%)
 copy test/{e2e/e2e-test/docker/storage/docker-compose.mysql.yml => e2e-v2/cases/event/mysql/docker-compose.yml} (85%)
 copy test/e2e-v2/cases/{vm/zabbix => event/mysql}/e2e.yaml (80%)