Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fe645109 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fe645109 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fe645109 Branch: refs/heads/master Commit: fe64510913710c268b4a17fa61a9e70fd2943d2d Parents: 17646af 61bfbb2 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri May 29 16:17:37 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri May 29 16:17:37 2015 -0400 ---------------------------------------------------------------------- .../simple/mapreduce/bulk/VerifyIngest.java | 18 +++++++----- .../accumulo/test/functional/ExamplesIT.java | 31 ++++++++++++-------- 2 files changed, 30 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
