Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fae16368 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fae16368 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fae16368 Branch: refs/heads/master Commit: fae16368668329c9b795aa8b595500e80af28396 Parents: ac2ddc5 bb8bdc0 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Fri Mar 21 10:24:27 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Fri Mar 21 10:24:27 2014 -0400 ---------------------------------------------------------------------- .../tserver/BulkFailedCopyProcessor.java | 21 +++--- .../accumulo/test/BulkImportVolumeIT.java | 75 ++++++++++++++++++++ 2 files changed, 86 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
