This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit ee24511d5b7811b0aa048a9048f62a6a1ccd2f93
Merge: 85e818d aabe05c
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Oct 10 15:00:51 2019 -0400
Merge branch '2.0'
.../clientImpl/AccumuloBulkMergeException.java | 32 +++++++++++
.../core/clientImpl/TableOperationsImpl.java | 2 +
.../accumulo/core/clientImpl/bulk/BulkImport.java | 64 ++++++++++++++++++----
.../thrift/TableOperationExceptionType.java | 5 +-
core/src/main/thrift/client.thrift | 1 +
.../master/tableOps/bulkVer2/PrepBulkImport.java | 7 +--
.../tableOps/bulkVer2/PrepBulkImportTest.java | 6 +-
7 files changed, 97 insertions(+), 20 deletions(-)
