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 85e818d  Fix classpath for metrics configuration for ITs (#1387)
     add aabe05c  Retry new Bulk import on merge. Fixes #471 (#1367)
     new ee24511  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:
 ...eption.java => AccumuloBulkMergeException.java} | 19 +++----
 .../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, 74 insertions(+), 30 deletions(-)
 copy 
core/src/main/java/org/apache/accumulo/core/clientImpl/{IsolationException.java 
=> AccumuloBulkMergeException.java} (69%)

Reply via email to