Skip to content

Commit 8cc0987

Browse files
oliver-zhangoliver-zhang
committed
Merge remote-tracking branch 'origin/log4j-appender' into log4j-appender
# Conflicts: # instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java
2 parents 7560a51 + 857cc02 commit 8cc0987

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)