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 2014/11/24 17:41:10 UTC

[1/6] accumulo git commit: ACCUMULO-3362 Fix incorrect javadoc for StatsCombiner

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 <el...@apache.org>
Authored: Mon Nov 24 11:38:45 2014 -0500
Committer: Josh Elser <el...@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 {


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

Posted by el...@apache.org.
Merge branch '1.6'


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

Branch: refs/heads/master
Commit: bfcb0edb6e209b56aa3a061594fc9a246c6e0639
Parents: ccc9a67 4ac9085
Author: Josh Elser <el...@apache.org>
Authored: Mon Nov 24 11:39:34 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Nov 24 11:39:34 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/examples/simple/combiner/StatsCombiner.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[2/6] accumulo git commit: ACCUMULO-3362 Fix incorrect javadoc for StatsCombiner

Posted by el...@apache.org.
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.6
Commit: c41b6dc057a10926f40c387b733c751671103f80
Parents: 1835c27
Author: Josh Elser <el...@apache.org>
Authored: Mon Nov 24 11:38:45 2014 -0500
Committer: Josh Elser <el...@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 {


[3/6] accumulo git commit: ACCUMULO-3362 Fix incorrect javadoc for StatsCombiner

Posted by el...@apache.org.
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/master
Commit: c41b6dc057a10926f40c387b733c751671103f80
Parents: 1835c27
Author: Josh Elser <el...@apache.org>
Authored: Mon Nov 24 11:38:45 2014 -0500
Committer: Josh Elser <el...@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 {


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

Posted by el...@apache.org.
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/4ac9085d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4ac9085d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4ac9085d

Branch: refs/heads/1.6
Commit: 4ac9085d49c7a8da7716404de59421fdca83d738
Parents: c5197aa c41b6dc
Author: Josh Elser <el...@apache.org>
Authored: Mon Nov 24 11:39:22 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Nov 24 11:39:22 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/examples/simple/combiner/StatsCombiner.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



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

Posted by el...@apache.org.
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/4ac9085d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4ac9085d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4ac9085d

Branch: refs/heads/master
Commit: 4ac9085d49c7a8da7716404de59421fdca83d738
Parents: c5197aa c41b6dc
Author: Josh Elser <el...@apache.org>
Authored: Mon Nov 24 11:39:22 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Nov 24 11:39:22 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/examples/simple/combiner/StatsCombiner.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------