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/1f375130 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f375130 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1f375130 Branch: refs/heads/master Commit: 1f3751309b52282fcfb88f87d15a746925fe854c Parents: d60a38c 6730880 Author: Josh Elser <els...@apache.org> Authored: Mon Feb 10 15:29:23 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Feb 10 15:29:23 2014 -0500 ---------------------------------------------------------------------- .../accumulo/core/client/impl/TabletServerBatchReaderIterator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f375130/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java ----------------------------------------------------------------------
