This is an automated email from the ASF dual-hosted git repository.
DomGarguilo pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 0155de056a Bump protobuf-java due to recent OpenTelemetry bump (#6526)
add 1bbee0531f Add memory used to scan trace spans (#6524)
new eb98075df6 Merge branch '2.1' into main
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
core/src/main/java/org/apache/accumulo/core/conf/Property.java | 4 +++-
.../main/java/org/apache/accumulo/core/trace/TraceAttributes.java | 2 ++
.../src/main/java/org/apache/accumulo/tserver/tablet/KVEntry.java | 8 +++++++-
.../main/java/org/apache/accumulo/tserver/tablet/TabletBase.java | 3 +++
.../main/java/org/apache/accumulo/test/tracing/ScanTracingIT.java | 8 ++++++++
5 files changed, 23 insertions(+), 2 deletions(-)