Repository: accumulo Updated Branches: refs/heads/1.5 1835c27ca -> c41b6dc05 refs/heads/1.6 c5197aaf4 -> 4ac9085d4 refs/heads/master ccc9a6788 -> bfcb0edb6
ACCUMULO-3362 Fix incorrect javadoc for StatsCombiner Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c41b6dc0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c41b6dc0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c41b6dc0 Branch: refs/heads/1.5 Commit: c41b6dc057a10926f40c387b733c751671103f80 Parents: 1835c27 Author: Josh Elser <els...@apache.org> Authored: Mon Nov 24 11:38:45 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Nov 24 11:38:45 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/examples/simple/combiner/StatsCombiner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c41b6dc0/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java index 0aebf74..41a531b 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java @@ -29,7 +29,7 @@ import org.apache.accumulo.core.iterators.SortedKeyValueIterator; /** * This combiner calculates the max, min, sum, and count of long integers represented as strings in values. It stores the result in a comma-separated value of - * the form max,min,sum,count. If such a value is encountered while combining, its information is incorporated into the running calculations of max, min, sum, + * the form min,max,sum,count. If such a value is encountered while combining, its information is incorporated into the running calculations of min, max, sum, * and count. See {@link Combiner} for more information on which values are combined together. See docs/examples/README.combiner for instructions. */ public class StatsCombiner extends Combiner {
