Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT cff4c2d1a -> 9fbc24abe refs/heads/1.6.1-SNAPSHOT c9c3fdd4f -> 7c17eb169 refs/heads/master d6b1e9a95 -> 0712ec972
Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cff4c2d1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cff4c2d1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cff4c2d1 Branch: refs/heads/1.6.1-SNAPSHOT Commit: cff4c2d1aa9a7f6e36c6e29cb1ffa22183cf4ea9 Parents: 5d4cf3b 0d4f4b1 Author: Josh Elser <els...@apache.org> Authored: Fri May 23 20:31:03 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri May 23 20:31:03 2014 -0400 ---------------------------------------------------------------------- .../random/RandomByteArrayMakerFunction.java | 60 -------------------- .../test/stress/random/RandomByteArrays.java | 14 ++--- .../test/stress/random/RandomMutations.java | 11 +++- .../test/stress/random/RandomWithinRange.java | 59 +++++++++++++++++++ .../accumulo/test/stress/random/Write.java | 33 +++++++---- .../test/stress/random/WriteOptions.java | 19 ++++++- test/system/stress/writer.sh | 4 +- 7 files changed, 114 insertions(+), 86 deletions(-) ----------------------------------------------------------------------