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 f3aa11a85c49555369450bed447486c6f6d689fa
Merge: f2f7030580 90ebfc67fd
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Sat Dec 21 20:49:31 2024 -0500
Merge branch '3.1'
.../resources/org/apache/accumulo/monitor/resources/js/bulkImport.js | 2 +-
.../resources/org/apache/accumulo/monitor/resources/js/compactions.js | 2 +-
.../src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js | 2 +-
.../src/main/resources/org/apache/accumulo/monitor/resources/js/gc.js | 2 +-
.../main/resources/org/apache/accumulo/monitor/resources/js/manager.js | 2 +-
.../main/resources/org/apache/accumulo/monitor/resources/js/navbar.js | 2 +-
.../main/resources/org/apache/accumulo/monitor/resources/js/overview.js | 2 +-
.../main/resources/org/apache/accumulo/monitor/resources/js/scans.js | 2 +-
.../resources/org/apache/accumulo/monitor/resources/js/systemAlert.js | 2 +-
.../main/resources/org/apache/accumulo/monitor/resources/js/tservers.js | 2 +-
.../main/resources/org/apache/accumulo/monitor/templates/default.ftl | 2 +-
.../src/main/resources/org/apache/accumulo/monitor/templates/server.ftl | 2 +-
.../src/main/resources/org/apache/accumulo/monitor/templates/table.ftl | 2 +-
.../src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
