This is an automated email from the ASF dual-hosted git repository.
edcoleman pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 03934832f5 fix merge from 2.1
add bd8a67fa4e ZooStore deferral time to use System.nanoTime() (#4126)
new 7921425c04 Merge remote-tracking branch 'upstream/2.1'
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:
.../org/apache/accumulo/core/fate/AdminUtil.java | 7 ++++---
.../org/apache/accumulo/core/fate/AgeOffStore.java | 9 ++++----
.../java/org/apache/accumulo/core/fate/Fate.java | 13 ++++++------
.../apache/accumulo/core/fate/ReadOnlyTStore.java | 8 +++++---
.../org/apache/accumulo/core/fate/ZooStore.java | 24 +++++++++++++---------
.../apache/accumulo/core/logging/FateLogger.java | 5 +++--
.../apache/accumulo/core/fate/AgeOffStoreTest.java | 17 +++++++--------
.../org/apache/accumulo/core/fate/TestStore.java | 3 ++-
8 files changed, 49 insertions(+), 37 deletions(-)
