You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/06/06 19:43:19 UTC
[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1975'
Merge branch 'TINKERPOP-1975'
Conflicts:
gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js
gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f6274ed1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f6274ed1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f6274ed1
Branch: refs/heads/master
Commit: f6274ed18bdb61e7e8bf25174580a0693f5aaa08
Parents: b75cfb8 160aef8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 6 15:42:59 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 6 15:42:59 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 ++
docker/hadoop/Dockerfile | 25 -------
docs/src/reference/the-traversal.asciidoc | 30 ++++++--
docs/src/upgrade/release-3.4.x.asciidoc | 49 +++++++++++++
.../tinkerpop/gremlin/jsr223/CoreImports.java | 4 ++
.../step/map/PageRankVertexProgramStep.java | 75 ++++++++++++++++++--
.../step/map/PeerPressureVertexProgramStep.java | 74 +++++++++++++++++--
.../process/traversal/Parameterizing.java | 37 ----------
.../traversal/dsl/graph/GraphTraversal.java | 24 ++++++-
.../process/traversal/step/Configuring.java | 41 +++++++++++
.../process/traversal/step/Mutating.java | 5 +-
.../process/traversal/step/Parameterizing.java | 39 ++++++++++
.../process/traversal/step/filter/DropStep.java | 9 ++-
.../traversal/step/map/AddEdgeStartStep.java | 6 +-
.../process/traversal/step/map/AddEdgeStep.java | 7 +-
.../traversal/step/map/AddVertexStartStep.java | 7 +-
.../traversal/step/map/AddVertexStep.java | 6 +-
.../traversal/step/map/EdgeOtherVertexStep.java | 15 +++-
.../traversal/step/map/EdgeVertexStep.java | 15 +++-
.../process/traversal/step/map/GraphStep.java | 15 +++-
.../traversal/step/map/PropertiesStep.java | 15 +++-
.../process/traversal/step/map/VertexStep.java | 15 +++-
.../step/sideEffect/AddPropertyStep.java | 9 +--
.../process/traversal/step/util/Parameters.java | 2 +
.../strategy/decoration/ElementIdStrategy.java | 2 +-
.../strategy/decoration/PartitionStrategy.java | 6 +-
.../traversal/dsl/graph/GraphTraversalTest.java | 2 +-
.../Process/Traversal/GraphTraversal.cs | 9 +++
gremlin-javascript/glv/generate.groovy | 3 +-
.../lib/process/graph-traversal.js | 10 +++
gremlin-python/glv/generate.groovy | 1 +
.../gremlin_python/process/graph_traversal.py | 4 ++
.../traversal/step/map/PageRankTest.java | 41 +++++++++++
.../traversal/step/map/PeerPressureTest.java | 31 +++++++-
34 files changed, 517 insertions(+), 120 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6274ed1/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6274ed1/docs/src/upgrade/release-3.4.x.asciidoc
----------------------------------------------------------------------