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/7e34ea92 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7e34ea92 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7e34ea92 Branch: refs/heads/1.6.1-SNAPSHOT Commit: 7e34ea9230ea1a53849555783e951904b259e1a6 Parents: 8bc8d4e f7fe2a8 Author: Bill Havanki <bhava...@cloudera.com> Authored: Thu Jun 26 11:08:56 2014 -0400 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Thu Jun 26 11:08: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(-) ----------------------------------------------------------------------
