This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a change to branch no-chop-merge
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from c4518402f0 Merge branch 'main' into no-chop-merge
add 12898a36b7 Roll up the manager's safe mode status indicator to the nav
bar (#3561)
add aaec35fcf8 normalize metric labels and structure (#3600)
add 313238b5e8 Roll up the manager's safe mode status indicator to the nav
bar (#3561)
add 04262c07d7 Merge branch '2.1'
add b59dfa9564 Add CI check to detect Thrift changes (#3362)
add a07499e07a Minor POM quality updates (#3419)
add 4f5d358dcc More build updates to reduce warnings (#3426)
add 497d741f7a Update datasketches-java to 4.0.0 (#3457)
add c1ed35411b Bump snappy-java from 1.1.9.1 to 1.1.10.1 (#3498)
add c6024b2b62 Bump guava from 31.1-jre to 32.0.0-jre (#3497)
add 9e8b59caa1 Update parent POM to 30 and remove contrib dir (#3550)
add c38c10fec1 Bump ZooKeeper patch version
add 67ca64eeb5 Merge branch '2.1'
add 12c0b7b018 Fix bad assert statements in tests (#3691)
add c99f708127 Merge branch '2.1'
add 38c261d123 consolidate y/n prompts in shell (#3684)
add 57903f4636 Merge branch '2.1'
add 805df4d4b2 Merge branch 'main' into no-chop-merge
No new revisions were added by this update.
Summary of changes:
.../accumulo/core/metrics/MetricsProducer.java | 31 +--
.../its/mapreduce/AccumuloInputFormatIT.java | 2 +-
pom.xml | 2 +-
.../apache/accumulo/monitor/resources/js/navbar.js | 230 ++++++++++++++-------
.../tserver/metrics/TabletServerScanMetrics.java | 2 +-
.../main/java/org/apache/accumulo/shell/Shell.java | 21 ++
.../accumulo/shell/commands/ConfigCommand.java | 32 ++-
.../shell/commands/DeleteNamespaceCommand.java | 14 +-
.../accumulo/shell/commands/DropUserCommand.java | 9 +-
.../accumulo/shell/commands/MergeCommand.java | 11 +-
.../accumulo/shell/commands/TableOperation.java | 24 +--
.../shell/commands/DropUserCommandTest.java | 11 +-
.../apache/accumulo/test/functional/TabletIT.java | 3 +-
.../org/apache/accumulo/test/shell/ShellIT.java | 10 +-
14 files changed, 231 insertions(+), 171 deletions(-)