This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from aed3919e46 Use Duration in Retry instead of long+TimeUnit (#4301) add 48f150045b Fixes compaction dispatcher documentation (#4314) new 9817474333 Merge branch '2.1' 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: .../main/java/org/apache/accumulo/core/Constants.java | 1 + .../java/org/apache/accumulo/core/conf/Property.java | 18 ++++++++++++------ .../spi/compaction/SimpleCompactionDispatcher.java | 10 +++++++--- .../accumulo/server/conf/CheckCompactionConfig.java | 4 +++- .../test/compaction/BadCompactionServiceConfigIT.java | 4 +++- 5 files changed, 26 insertions(+), 11 deletions(-)