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/9a8554f9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9a8554f9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9a8554f9 Branch: refs/heads/master Commit: 9a8554f9c699fa2eacc0cbd65df2356124beff2d Parents: ef7c4f0 65acebb Author: Josh Elser <els...@apache.org> Authored: Thu Oct 2 17:11:22 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Oct 2 17:11:22 2014 -0400 ---------------------------------------------------------------------- .../test/functional/BulkSplitOptimizationIT.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
