Repository: tinkerpop Updated Branches: refs/heads/master f1435cdc0 -> 71eab278b
Revert to older version of giraph The new version seems to cause hadoop to hang. Learned this through problems with doc generation. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/71eab278 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/71eab278 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/71eab278 Branch: refs/heads/master Commit: 71eab278b1b7f629e895e225ab99ac8cee0e22f1 Parents: f1435cd Author: Stephen Mallette <sp...@genoprime.com> Authored: Wed Aug 16 09:15:40 2017 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Wed Aug 16 09:15:40 2017 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 - giraph-gremlin/pom.xml | 2 +- .../gremlin/giraph/process/computer/GiraphMessageCombiner.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71eab278/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index b7b2717..6a67093 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -29,7 +29,6 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) * Removed previously deprecated `ScriptElementFactory`. * Added `GraphTraversalSource.addE(String)` in support of `g.addE().from().to()`. * Added support for `to(Vertex)` and `from(Vertex)` as a shorthand for `to(V(a))` and `from(V(b))`. -* Bumped to support Giraph 1.2.0. * Bumped to support Spark 2.2.0. * Detected if type checking was required in `GremlinGroovyScriptEngine` and disabled related infrastructure if not. * Removed previously deprecated `GraphTraversal.selectV3d0()` step. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71eab278/giraph-gremlin/pom.xml ---------------------------------------------------------------------- diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml index 1a1ebfe..e954bf6 100644 --- a/giraph-gremlin/pom.xml +++ b/giraph-gremlin/pom.xml @@ -64,7 +64,7 @@ limitations under the License. <dependency> <groupId>org.apache.giraph</groupId> <artifactId>giraph-core</artifactId> - <version>1.2.0-hadoop2</version> + <version>1.1.0-hadoop2</version> <exclusions> <!-- self conflicts --> <exclusion> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71eab278/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java ---------------------------------------------------------------------- diff --git a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java index 4c2a12e..4d725b2 100644 --- a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java +++ b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java @@ -30,7 +30,7 @@ import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ -public final class GiraphMessageCombiner implements org.apache.giraph.combiner.MessageCombiner<ObjectWritable, ObjectWritable>, ImmutableClassesGiraphConfigurable { +public final class GiraphMessageCombiner extends org.apache.giraph.combiner.MessageCombiner<ObjectWritable, ObjectWritable> implements ImmutableClassesGiraphConfigurable { private MessageCombiner messageCombiner; private ImmutableClassesGiraphConfiguration configuration;
