(accumulo) 01/01: Merge remote-tracking branch 'upstream/2.1'

[edcoleman]

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

edcoleman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 7921425c0482d660e9565b02002121957afbf947
Merge: 03934832f5 bd8a67fa4e
Author: Ed Coleman <edcole...@apache.org>
AuthorDate: Thu Jan 4 19:47:10 2024 +0000

    Merge remote-tracking branch 'upstream/2.1'

 .../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(-)

diff --cc core/src/main/java/org/apache/accumulo/core/fate/ZooStore.java
index 728cabcf7e,219581268c..c8922a1493
--- a/core/src/main/java/org/apache/accumulo/core/fate/ZooStore.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/ZooStore.java
@@@ -62,7 -62,8 +63,7 @@@ public class ZooStore<T> implements TSt
    private ZooReaderWriter zk;
    private String lastReserved = "";
    private Set<Long> reserved;
-   private Map<Long,Long> defered;
+   private Map<Long,Long> deferred;
 -  private static final SecureRandom random = new SecureRandom();
    private long statusChangeEvents = 0;
    private int reservationsWaiting = 0;