Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/caf1ffb1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/caf1ffb1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/caf1ffb1 Branch: refs/heads/master Commit: caf1ffb1bde70e7be9d5f7721246a3f27608a3f4 Parents: 9b54753 2d51e32 Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Jan 9 14:21:42 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Jan 9 14:21:42 2014 -0500 ---------------------------------------------------------------------- .../examples/simple/client/RandomBatchScanner.java | 7 +------ .../examples/simple/client/RandomBatchWriter.java | 5 +++-- .../java/org/apache/accumulo/test/IMMLGBenchmark.java | 13 +++++++------ .../org/apache/accumulo/test/ConditionalWriterIT.java | 13 +++++++------ 4 files changed, 18 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
