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/9754322d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9754322d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9754322d Branch: refs/heads/master Commit: 9754322d386c342ae6194eb02b110b6403419c4f Parents: fc0c562 b68ae97 Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Feb 14 12:40:00 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Feb 14 12:40:00 2014 -0500 ---------------------------------------------------------------------- .../core/client/impl/TabletServerBatchReaderIterator.java | 1 - test/src/test/java/org/apache/accumulo/test/ShellServerIT.java | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) ----------------------------------------------------------------------
