This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a change to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from e158859462 Merge branch '2.1' into 3.1
add 5715f06fc8 Fix ExternalCompaction_1_IT.testPartialCompaction failure
(#5054)
new 0ad4d3e7b0 Merge branch '2.1' into 3.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:
core/src/main/java/org/apache/accumulo/core/conf/Property.java | 6 ++++++
.../src/main/java/org/apache/accumulo/compactor/Compactor.java | 5 ++---
.../accumulo/test/compaction/ExternalCompactionTestUtils.java | 1 +
.../apache/accumulo/test/compaction/ExternalCompaction_1_IT.java | 9 +++++++++
4 files changed, 18 insertions(+), 3 deletions(-)
