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 2015/08/25 15:06:07 UTC

[10/17] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: 6a0c7441d3fc5bfc24c7fd1ee4f5703a4af7b95d
Parents: f062c92 bcf9153
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 25 08:58:03 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 25 08:58:03 2015 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  2 +
 docs/src/gremlin-applications.asciidoc          | 46 ++++++++++++++++
 .../traversal/dsl/graph/GraphTraversal.java     |  2 +-
 .../process/traversal/lambda/LoopTraversal.java | 57 ++++++++++++++++++++
 .../process/traversal/step/map/MatchStep.java   |  4 +-
 .../traversal/step/map/OrderLocalStep.java      | 11 +++-
 .../traversal/step/sideEffect/GraphStep.java    | 12 +++--
 .../step/util/TraversalComparator.java          |  4 ++
 .../tinkerpop/gremlin/structure/Graph.java      | 40 +++++++++++---
 .../tinkerpop/gremlin/structure/io/IoCore.java  |  9 ++++
 .../traversal/step/map/GroovyMatchTest.groovy   |  5 ++
 .../traversal/step/map/GroovyOrderTest.groovy   |  7 ++-
 .../traversal/step/map/GroovyVertexTest.groovy  | 12 ++++-
 .../gremlin/groovy/jsr223/ScriptExecutor.java   |  4 +-
 .../gremlin/groovy/plugin/Artifact.java         |  9 ++++
 .../gremlin/groovy/plugin/GremlinPlugin.java    |  7 +--
 .../gremlin/groovy/plugin/PluginAcceptor.java   | 10 +++-
 .../gremlin/groovy/plugin/RemoteAcceptor.java   | 20 ++++---
 .../groovy/plugin/SugarGremlinPlugin.java       |  7 +++
 .../CredentialGraphGremlinPlugin.java           | 14 ++---
 .../tinkerpop/gremlin/AbstractGremlinTest.java  | 38 ++++++-------
 .../process/traversal/step/map/MatchTest.java   | 31 +++++++++--
 .../process/traversal/step/map/OrderTest.java   | 39 ++++++++++++--
 .../process/traversal/step/map/VertexTest.java  | 29 +++++++++-
 .../traversal/step/sideEffect/ProfileTest.java  | 15 +-----
 .../step/sideEffect/Neo4jGraphStep.java         |  2 +-
 .../step/sideEffect/TinkerGraphStep.java        |  2 +-
 27 files changed, 361 insertions(+), 77 deletions(-)
----------------------------------------------------------------------