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/8253ca05 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8253ca05 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8253ca05 Branch: refs/heads/master Commit: 8253ca05fc3d2900175a2df63ce0642c5f184737 Parents: 4f13913 7e34ea9 Author: Bill Havanki <bhava...@cloudera.com> Authored: Thu Jun 26 11:09:06 2014 -0400 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Thu Jun 26 11:09: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(-) ----------------------------------------------------------------------
