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 f203043e831391496a94210c8e10ebd9c805cb40
Merge: d20b5a8cde 719697786c
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Fri Oct 13 17:43:31 2023 -0400
Merge branch '2.1'
LICENSE | 11 +-
assemble/src/main/resources/LICENSE | 25 +
.../core/clientImpl/TableOperationsImpl.java | 2 +-
.../org/apache/accumulo/core/data/Mutation.java | 4 +-
.../miniclusterImpl/MiniAccumuloClusterImpl.java | 2 +-
pom.xml | 6 +-
.../java/org/apache/accumulo/manager/Manager.java | 5 +-
.../manager/ManagerClientServiceHandler.java | 2 +-
.../manager/tableOps/compact/CompactionDriver.java | 3 +-
.../src/main/appended-resources/META-INF/LICENSE | 11 +-
.../accumulo/monitor/resources/css/screen.css | 3 +-
.../external/bootstrap/css/bootstrap-icons.css | 2078 ++++++++++++++++++++
.../external/bootstrap/fonts/arrow-repeat.svg | 4 -
.../external/bootstrap/fonts/bootstrap-icons.woff | Bin 0 -> 176200 bytes
.../external/bootstrap/fonts/bootstrap-icons.woff2 | Bin 0 -> 130608 bytes
.../bootstrap/fonts/three-dots-vertical.svg | 3 -
.../apache/accumulo/monitor/resources/js/navbar.js | 1 +
.../accumulo/monitor/resources/js/systemAlert.js | 172 ++
.../apache/accumulo/monitor/templates/default.ftl | 3 +
.../org/apache/accumulo/monitor/templates/ec.ftl | 4 +-
.../apache/accumulo/monitor/templates/navbar.ftl | 5 +-
.../accumulo/monitor/templates/systemAlert.ftl | 31 +
.../accumulo/tserver/TabletClientHandler.java | 3 +-
.../org/apache/accumulo/tserver/log/DfsLogger.java | 2 +-
.../org/apache/accumulo/tserver/log/LogSorter.java | 4 +-
.../accumulo/tserver/logger/LogFileValue.java | 2 +-
.../apache/accumulo/tserver/logger/LogReader.java | 2 +-
.../accumulo/shell/commands/GetAuthsCommand.java | 4 +-
test/pom.xml | 4 +-
.../test/compaction/CompactionExecutorIT.java | 2 +-
.../accumulo/test/functional/CompactionIT.java | 2 +-
31 files changed, 2365 insertions(+), 35 deletions(-)
diff --cc server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index d59ca8d552,b86cba576c..009a407dd0
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@@ -18,7 -18,7 +18,8 @@@
*/
package org.apache.accumulo.manager;
+import static
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
+ import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Collections.emptySortedMap;
import static java.util.concurrent.TimeUnit.HOURS;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --cc
test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
index 928810fbe1,9bff345b17..6e48bf1cf0
--- a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
@@@ -30,8 -28,8 +30,9 @@@ import static org.junit.jupiter.api.Ass
import java.io.IOException;
import java.time.Duration;
import java.util.ArrayList;
+ import java.util.Arrays;
import java.util.EnumSet;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
