This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 75e4255 Merge branch '2.0' add 5650335 Fix #1273 Fix Bulk Messages (#1287) add 3a4a4d6 fix #1286 throw exception on empty bulk import (#1292) new 97c6c06 Merge branch '2.0' 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/core/clientImpl/bulk/BulkImport.java | 26 +++-- .../apache/accumulo/core/file/FileOperations.java | 13 +++ .../bulk/BulkImportFilterInvalidTest.java | 114 +++++++++++++++++++++ server/master/pom.xml | 4 + .../master/tableOps/bulkVer2/PrepBulkImport.java | 34 ++---- .../apache/accumulo/test/functional/BulkNewIT.java | 10 ++ 6 files changed, 164 insertions(+), 37 deletions(-) create mode 100644 core/src/test/java/org/apache/accumulo/core/clientImpl/bulk/BulkImportFilterInvalidTest.java