You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by el...@apache.org on 2015/02/03 00:14:34 UTC

[5/6] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4999b5a2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4999b5a2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4999b5a2

Branch: refs/heads/1.6
Commit: 4999b5a2398c04f70423d11624aa0ba114b73faf
Parents: c5d2bd5 4e8471a
Author: Josh Elser <el...@apache.org>
Authored: Mon Feb 2 18:10:17 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Feb 2 18:10:17 2015 -0500

----------------------------------------------------------------------
 .../core/client/impl/TabletServerBatchReaderIterator.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4999b5a2/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
----------------------------------------------------------------------