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/28816315 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/28816315 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/28816315 Branch: refs/heads/master Commit: 28816315fc37e359af77b0714bb330aece09e684 Parents: 6ca80ef b3e4bec Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Apr 29 16:42:41 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Apr 29 16:42:41 2014 -0400 ---------------------------------------------------------------------- CHANGES | 1 + .../java/org/apache/accumulo/test/TestMultiTableIngest.java | 4 ++++ .../org/apache/accumulo/test/functional/ReadWriteIT.java | 9 +++++---- 3 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/28816315/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java ----------------------------------------------------------------------
