This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit bbe1110e98c14e84b0ff4c03cdc22283c4cfedff Merge: 67a91a79b5 62223f1e27 Author: Christopher Tubbs <[email protected]> AuthorDate: Mon Feb 9 15:55:15 2026 -0500 Merge branch '2.1' .../org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java | 1 + .../org/apache/accumulo/manager/tableOps/bulkVer2/BulkImportMove.java | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --cc server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/BulkImportMove.java index 7a0022acf1,492a61efd6..be562273ba --- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/BulkImportMove.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/BulkImportMove.java @@@ -26,16 -29,18 +26,14 @@@ import org.apache.accumulo.core.clientI import org.apache.accumulo.core.clientImpl.bulk.BulkSerialize; import org.apache.accumulo.core.clientImpl.thrift.TableOperation; import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType; -import org.apache.accumulo.core.conf.AccumuloConfiguration; -import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.core.fate.FateTxId; +import org.apache.accumulo.core.fate.FateId; import org.apache.accumulo.core.fate.Repo; import org.apache.accumulo.core.logging.BulkLogger; -import org.apache.accumulo.core.manager.state.tables.TableState; -import org.apache.accumulo.core.master.thrift.BulkImportState; -import org.apache.accumulo.manager.Manager; -import org.apache.accumulo.manager.tableOps.ManagerRepo; +import org.apache.accumulo.core.manager.thrift.BulkImportState; +import org.apache.accumulo.manager.tableOps.AbstractFateOperation; +import org.apache.accumulo.manager.tableOps.FateEnv; import org.apache.accumulo.server.fs.VolumeManager; -import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator; import org.apache.hadoop.fs.Path; - import org.slf4j.Logger; - import org.slf4j.LoggerFactory; /** * Bulk import makes requests of tablet servers, and those requests can take a long time. Our
