This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit df6097424a17aec527049662d5643e382b5cf043
Merge: d8cb61a73f d40e89d301
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Mon Jun 24 18:15:25 2024 +0000
Merge branch 'main' into elasticity
.../spi/balancer/HostRegexTableLoadBalancer.java | 3 +-
.../accumulo/core/util/tables/TableZooHelper.java | 17 ++++++
.../server/client/ClientServiceHandler.java | 5 +-
.../server/security/AuditedSecurityOperation.java | 7 ++-
.../server/security/SecurityOperation.java | 5 +-
.../apache/accumulo/manager/tableOps/Utils.java | 32 ++++++++--
.../manager/tableOps/clone/ClonePermissions.java | 4 +-
.../manager/tableOps/clone/CloneZookeeper.java | 4 +-
.../manager/tableOps/create/PopulateZookeeper.java | 2 +-
.../manager/tableOps/create/SetupPermissions.java | 3 +-
.../manager/tableOps/rename/RenameTable.java | 2 +-
.../tableImport/ImportPopulateZookeeper.java | 2 +-
.../tableImport/ImportSetupPermissions.java | 2 +-
.../org/apache/accumulo/test/CreateTableIT.java | 69 ++++++++++++++++++++++
14 files changed, 133 insertions(+), 24 deletions(-)
diff --cc
core/src/main/java/org/apache/accumulo/core/util/tables/TableZooHelper.java
index 10809c3cc2,7d8cb852dc..66a41768d6
---
a/core/src/main/java/org/apache/accumulo/core/util/tables/TableZooHelper.java
+++
b/core/src/main/java/org/apache/accumulo/core/util/tables/TableZooHelper.java
@@@ -35,9 -36,10 +36,10 @@@ import org.apache.accumulo.core.data.Na
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.fate.zookeeper.ZooCache;
import org.apache.accumulo.core.manager.state.tables.TableState;
+ import org.apache.accumulo.core.metadata.AccumuloTable;
+import org.apache.accumulo.core.util.cache.Caches.CacheName;
import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
public class TableZooHelper implements AutoCloseable {
