This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch docker/agent
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 0f472a2 Update CHANGES.md
add 2b85ba1 Fix `disable` statement not working (#6687)
add 95e912b Merge branch 'master' into docker/agent
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 5 +++--
docs/en/concepts-and-designs/oal.md | 2 ++
.../src/main/resources/oal/core.oal | 11 ----------
.../src/main/resources/oal/disable.oal | 25 +++++++++++-----------
.../oap/server/core/CoreModuleProvider.java | 12 +++++++----
.../{CoreOALDefine.java => DisableOALDefine.java} | 11 +++++-----
6 files changed, 32 insertions(+), 34 deletions(-)
copy
apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java
=> oap-server/server-bootstrap/src/main/resources/oal/disable.oal (64%)
copy
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/oal/rt/{CoreOALDefine.java
=> DisableOALDefine.java} (78%)