You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2015/10/02 22:13:30 UTC

[2/4] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7


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

Branch: refs/heads/master
Commit: 713282a0e38f2146466ed631b9ad9fa26aaf2a39
Parents: 4623103 f320385
Author: Keith Turner <kt...@apache.org>
Authored: Fri Oct 2 15:43:38 2015 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Fri Oct 2 15:43:38 2015 -0400

----------------------------------------------------------------------
 .../src/main/java/org/apache/accumulo/core/iterators/Combiner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/713282a0/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
----------------------------------------------------------------------