Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c731fbfd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c731fbfd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c731fbfd Branch: refs/heads/master Commit: c731fbfd753ac027ded5adec813bd9958bbac830 Parents: 41b72b5 75c053d Author: Bill Havanki <bhava...@cloudera.com> Authored: Tue Jul 1 15:24:41 2014 -0400 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Tue Jul 1 15:24:41 2014 -0400 ---------------------------------------------------------------------- .../test/stress/random/RandomMutations.java | 21 ++++++++++++++++---- .../accumulo/test/stress/random/Write.java | 5 ++++- .../test/stress/random/WriteOptions.java | 3 +++ test/system/stress/stress-env.sh.example | 4 ++++ test/system/stress/writer.sh | 2 +- 5 files changed, 29 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
