This is an automated email from the ASF dual-hosted git repository. cshannon pushed a commit to branch no-chop-merge-prototype in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 204010ed299bf76d738826f646df447d9de9c081 Merge: 843f87a25b 38d28c233c Author: Christopher L. Shannon (cshannon) <[email protected]> AuthorDate: Fri Aug 4 08:20:39 2023 -0400 Merge branch 'main' into no-chop-merge-prototype .../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(-)
