Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo 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/045f7b20 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/045f7b20 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/045f7b20 Branch: refs/heads/master Commit: 045f7b20f5b7edbd6c8b3ef99de721db5030c3af Parents: f989e4b 7e34ea9 Author: Keith Turner <ktur...@apache.org> Authored: Thu Jun 26 11:33:44 2014 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Thu Jun 26 11:33:44 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(-) ----------------------------------------------------------------------
