Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ebb0e1d7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ebb0e1d7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ebb0e1d7 Branch: refs/heads/master Commit: ebb0e1d7b83dd9c80a76f45df3ee630b9afcfd8e Parents: 54475e5 1d288cf Author: Josh Elser <els...@apache.org> Authored: Mon Dec 1 22:49:43 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Dec 1 22:49:43 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/server/client/BulkImporter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ebb0e1d7/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java ---------------------------------------------------------------------- diff --cc server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java index 5496eb4,4cc13a9..593d9b7 --- a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java +++ b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java @@@ -140,9 -146,9 +140,9 @@@ public class BulkImporter public void run() { List<TabletLocation> tabletsToAssignMapFileTo = Collections.emptyList(); try { - tabletsToAssignMapFileTo = findOverlappingTablets(ServerConfiguration.getSystemConfiguration(instance), fs, locator, mapFile, credentials); + tabletsToAssignMapFileTo = findOverlappingTablets(context, fs, locator, mapFile); } catch (Exception ex) { - log.warn("Unable to find tablets that overlap file " + mapFile.toString()); + log.warn("Unable to find tablets that overlap file " + mapFile.toString(), ex); } log.debug("Map file " + mapFile + " found to overlap " + tabletsToAssignMapFileTo.size() + " tablets"); if (tabletsToAssignMapFileTo.size() == 0) {
