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 fbe236d4c9 Merge branch '2.1' into 3.1 add 3826ebd538 Log iteration to result count in BulkImport code (#5312) add c817c976f9 Created LoadFilesTest (#5355) new e4d83cca90 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/metadata/schema/TabletMetadata.java | 2 +- .../core/metadata/schema/TabletsMetadata.java | 3 +- .../manager/tableOps/bulkVer2/LoadFiles.java | 91 ++++-- .../manager/tableOps/bulkVer2/LoadFilesTest.java | 304 +++++++++++++++++++++ .../tableOps/bulkVer2/PrepBulkImportTest.java | 4 +- 5 files changed, 380 insertions(+), 24 deletions(-) create mode 100644 server/manager/src/test/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFilesTest.java