Merge branch '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/32a02b90 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/32a02b90 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/32a02b90 Branch: refs/heads/master Commit: 32a02b906d678f212342eba58d9faf1e2e54eca6 Parents: fa71c59 f573a14 Author: Keith Turner <ktur...@apache.org> Authored: Thu Jun 26 11:34:56 2014 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Thu Jun 26 11:34:56 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(-) ----------------------------------------------------------------------
