Merge branch '1.5.1-SNAPSHOT' into 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/b4b0c0ee Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b4b0c0ee Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b4b0c0ee Branch: refs/heads/master Commit: b4b0c0ee63f47bfb0ab1b884ba511d90a5551dcc Parents: d8fd73e 78ba31d Author: Josh Elser <els...@apache.org> Authored: Mon Feb 10 11:33:15 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Feb 10 11:33:15 2014 -0500 ---------------------------------------------------------------------- .../accumulo/core/client/impl/TabletServerBatchReaderIterator.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4b0c0ee/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java ----------------------------------------------------------------------
