Updated Branches: refs/heads/trunk 7b724131f -> 9f7a34789
GIRAPH-608: Spelling error in Combiner.java (Michael Aro via aching) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/9f7a3478 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/9f7a3478 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/9f7a3478 Branch: refs/heads/trunk Commit: 9f7a347896248ef1136d59e9a5b1b872ea11941b Parents: 7b72413 Author: Avery Ching <[email protected]> Authored: Wed May 15 12:06:08 2013 -0700 Committer: Avery Ching <[email protected]> Committed: Wed May 15 12:06:08 2013 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../java/org/apache/giraph/combiner/Combiner.java | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/9f7a3478/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 50547c0..52f8099 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-608: Spelling error in Combiner.java (Michael Aro via aching) + GIRAPH-666: Netty execs threads and metrics threads don't get cleaned up properly (aching) http://git-wip-us.apache.org/repos/asf/giraph/blob/9f7a3478/giraph-core/src/main/java/org/apache/giraph/combiner/Combiner.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/combiner/Combiner.java b/giraph-core/src/main/java/org/apache/giraph/combiner/Combiner.java index a28e25c..7830fff 100644 --- a/giraph-core/src/main/java/org/apache/giraph/combiner/Combiner.java +++ b/giraph-core/src/main/java/org/apache/giraph/combiner/Combiner.java @@ -32,7 +32,7 @@ import org.apache.hadoop.io.WritableComparable; public abstract class Combiner<I extends WritableComparable, M extends Writable> { /** - * Combine messageToCombine with originalMassage, + * Combine messageToCombine with originalMessage, * by modifying originalMessage. * * @param vertexIndex Index of the vertex getting these messages
