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 2017/05/26 13:32:59 UTC
[5/6] tinkerpop git commit: Merge branch 'tp32'

Merge branch 'tp32'

Conflicts:
	gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/GraphTraversalSourceGenerator.groovy
	gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
	gremlin-python/src/main/jython/gremlin_python/process/traversal.py


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

Branch: refs/heads/master
Commit: 81ad2dfd57f3956aa57a9f2bb0f53522c6fdcf94
Parents: f1a2e49 2bc5431
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 26 09:30:28 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 26 09:30:28 2017 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   1 +
 .../gremlin-language-variants/index.asciidoc    |   6 +-
 gremlin-python/pom.xml                          | 120 +++++--
 .../python/GraphTraversalSourceGenerator.groovy | 211 -----------
 .../python/TraversalSourceGenerator.groovy      | 356 -------------------
 .../gremlin/python/GenerateGremlinPython.java   |  32 --
 .../resources/GraphTraversalSource.template     | 102 ++++++
 .../src/main/resources/TraversalSource.template | 282 +++++++++++++++
 8 files changed, 478 insertions(+), 632 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81ad2dfd/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81ad2dfd/docs/src/tutorials/gremlin-language-variants/index.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81ad2dfd/gremlin-python/pom.xml
----------------------------------------------------------------------