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 15610b2e97 Merge branch 'main' into no-chop-merge
add 43df0b1db4 adds bulk import v1 to ScanConsistencyIT (#3672)
add b217d892cd Merge branch '2.1'
add fdee413764 change exit error code for ZooPropEditor (#3664)
add 91d81531ab Merge branch '2.1'
add a6f24d7f83 Make scan and compaction columns numerically sortable
(#3612)
add 94a1d6f2a8 Merge branch '2.1'
add 26a71d0627 Scale Wait by timeout.factor and more IT QA work (#3675)
add 38d28c233c Merge branch '2.1'
new 5954c4ca6b Merge branch 'main' into no-chop-merge
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../accumulo/server/conf/util/ZooPropEditor.java | 8 ----
.../monitor/rest/tables/TableInformation.java | 12 +++---
.../rest/tservers/TabletServerInformation.java | 12 +++---
.../apache/accumulo/monitor/resources/js/table.js | 46 +++++++++++++++++++++
.../accumulo/monitor/resources/js/tservers.js | 46 +++++++++++++++++++++
.../apache/accumulo/monitor/templates/tables.ftl | 30 +++++++++++++-
test/pom.xml | 1 +
.../apache/accumulo/harness/AccumuloITBase.java | 18 ++++----
.../accumulo/test/BadDeleteMarkersCreatedIT.java | 10 +----
.../apache/accumulo/test/ScanConsistencyIT.java | 11 +----
.../accumulo/test/functional/LargeRowIT.java | 12 +-----
.../test/functional/ManagerAssignmentIT.java | 13 +++---
.../accumulo/test/functional/WALSunnyDayIT.java | 15 +------
.../java/org/apache/accumulo/test/util/Wait.java | 48 ++++++++++++++++++----
14 files changed, 193 insertions(+), 89 deletions(-)
