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/f8861bf3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f8861bf3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f8861bf3 Branch: refs/heads/master Commit: f8861bf3e4b4fa80f56fd24e9d58768e3d3826d6 Parents: 9801fe9 f7fe2a8 Author: Keith Turner <ktur...@apache.org> Authored: Thu Jun 26 11:32:06 2014 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Thu Jun 26 11:32:06 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/test/stress/random/Scan.java | 3 +++ .../org/apache/accumulo/test/stress/random/ScanOpts.java | 5 ++++- .../org/apache/accumulo/test/stress/random/Write.java | 10 +++++++++- .../apache/accumulo/test/stress/random/WriteOptions.java | 5 ++++- test/system/stress/reader.sh | 6 +++++- test/system/stress/writer.sh | 6 +++++- 6 files changed, 30 insertions(+), 5 deletions(-) ----------------------------------------------------------------------