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/e10d1a7a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e10d1a7a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e10d1a7a Branch: refs/heads/master Commit: e10d1a7a50784cdce3afa24b071e203b04c5ec17 Parents: 3c40b52 fac91d3 Author: Keith Turner <ktur...@apache.org> Authored: Wed Apr 23 20:59:36 2014 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Wed Apr 23 20:59:36 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/test/randomwalk/conditional/Init.java | 10 ++++++++-- .../accumulo/test/randomwalk/conditional/Transfer.java | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e10d1a7a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e10d1a7a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java ----------------------------------------------------------------------
