Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4e2adbb3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4e2adbb3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4e2adbb3 Branch: refs/heads/master Commit: 4e2adbb3df8deefdc5ffaad48d163ddeaa3a6cfa Parents: 84f7073 a38c9ad Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri May 6 19:07:57 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri May 6 19:07:57 2016 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/file/FileOperations.java | 14 +++++--------- .../apache/accumulo/test/BatchWriterIterator.java | 18 +++++++++--------- 2 files changed, 14 insertions(+), 18 deletions(-) ----------------------------------------------------------------------