[accumulo] branch master updated (3c55045 -> 7ffea63)

[kt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kturner pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


    from 3c55045  Merge branch '2.0'
     add 9a5ec83  Make bulk load mapping matching more strict #1260 (#1269)
     new 7ffea63  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:
 .../master/tableOps/bulkVer2/LoadFiles.java        | 59 ++++++++++++++++------
 1 file changed, 43 insertions(+), 16 deletions(-)

[accumulo] 01/01: Merge branch '2.0'

[kt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 7ffea63a56dcc1ebd0f0e350f9640175fe8bfb91
Merge: 3c55045 9a5ec83
Author: Keith Turner <kt...@apache.org>
AuthorDate: Mon Jul 15 11:03:01 2019 -0400

    Merge branch '2.0'

 .../master/tableOps/bulkVer2/LoadFiles.java        | 59 ++++++++++++++++------
 1 file changed, 43 insertions(+), 16 deletions(-)

diff --cc server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java
index 8147185,98d59ed..7f069ad
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java
@@@ -17,11 -17,9 +17,12 @@@
  package org.apache.accumulo.master.tableOps.bulkVer2;
  
  import static java.nio.charset.StandardCharsets.UTF_8;
 +import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOADED;
 +import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOCATION;
 +import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.PREV_ROW;
  
  import java.util.ArrayList;
+ import java.util.Comparator;
  import java.util.HashMap;
  import java.util.Iterator;
  import java.util.List;