Merge branch 'tp33'
Conflicts:
giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6a645c0a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6a645c0a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6a645c0a
Branch: refs/heads/master
Commit: 6a645c0aeffe524246f04ecf83eca8b510c924f3
Parents: 17c4e77 a708cc3
Author: Stephen Mallette <[email protected]>
Authored: Mon May 21 12:43:19 2018 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Mon May 21 12:43:19 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../process/computer/MemoryComputeKey.java | 15 +++++++------
.../traversal/TraversalVertexProgram.java | 9 ++++----
.../step/map/TraversalVertexProgramStep.java | 10 ++++-----
.../computer/util/VertexProgramHelper.java | 22 +++++++++++++-------
5 files changed, 33 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6a645c0a/CHANGELOG.asciidoc
----------------------------------------------------------------------
