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/11/24 01:13:46 UTC

[05/11] incubator-tinkerpop git commit: Merge remote-tracking branch 'upstream/master'

Merge remote-tracking branch 'upstream/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/b71b733c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b71b733c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b71b733c

Branch: refs/heads/master
Commit: b71b733cc0fa26d98d15ec628298b6cd58610c27
Parents: c6626da 4a995c2
Author: Kushal <ku...@foodinhood.com>
Authored: Fri Nov 20 22:20:31 2015 -0800
Committer: Kushal <ku...@foodinhood.com>
Committed: Fri Nov 20 22:20:31 2015 -0800

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              | 100 +++-
 docs/src/developer-contributing.asciidoc        |  70 ++-
 docs/src/developer-meetings.asciidoc            |   2 +-
 docs/src/developer-release.asciidoc             |  45 +-
 docs/src/gremlin-applications.asciidoc          |  27 +
 docs/src/the-graph.asciidoc                     |   3 +
 docs/src/the-traversal.asciidoc                 |  35 +-
 docs/src/tutorials-getting-started.asciidoc     | 571 +++++++++++++++++++
 .../upgrade-release-3.0.x-incubating.asciidoc   |  91 ++-
 .../upgrade-release-3.1.x-incubating.asciidoc   | 217 +++++--
 .../images/gremlin-on-software-vertex.png       | Bin 0 -> 39573 bytes
 docs/static/images/gremlin-to-the-6.png         | Bin 0 -> 71084 bytes
 docs/static/images/gremlin-to-the-7.png         | Bin 0 -> 80114 bytes
 docs/static/images/gremlin-to-the-8.png         | Bin 0 -> 107598 bytes
 docs/static/images/gremlin-to-the-9.png         | Bin 0 -> 135099 bytes
 .../images/modern-edge-1-to-3-1-gremlin.png     | Bin 0 -> 11607 bytes
 docs/static/images/modern-edge-1-to-3-1.png     | Bin 0 -> 3210 bytes
 .../images/modern-edge-1-to-3-2-gremlin.png     | Bin 0 -> 17029 bytes
 docs/static/images/modern-edge-1-to-3-2.png     | Bin 0 -> 4420 bytes
 .../images/modern-edge-1-to-3-3-gremlin.png     | Bin 0 -> 20948 bytes
 docs/static/images/modern-edge-1-to-3-3.png     | Bin 0 -> 7372 bytes
 docs/static/images/quantum-gremlin-atom.png     | Bin 0 -> 816113 bytes
 giraph-gremlin/pom.xml                          |   2 +-
 gremlin-console/pom.xml                         |   2 +-
 .../groovy/plugin/DriverRemoteAcceptor.java     |  38 +-
 .../DriverRemoteAcceptorIntegrateTest.java      |   8 +
 .../groovy/plugin/DriverRemoteAcceptorTest.java |  40 ++
 gremlin-core/pom.xml                            |   2 +-
 .../gremlin/process/traversal/Traversal.java    |  12 +
 .../process/traversal/step/util/Parameters.java |  15 +-
 .../finalization/EngineDependentStrategy.java   |   8 +-
 .../AdjacentToIncidentStrategy.java             |   5 +-
 .../IncidentToAdjacentStrategy.java             |   6 +
 .../traversal/util/DefaultTraversal.java        |  13 +-
 .../util/DefaultTraversalStrategies.java        |   2 +-
 .../traversal/util/TraversalExplanation.java    | 117 ++++
 .../process/traversal/util/TraversalHelper.java |   8 +-
 .../structure/io/graphson/GraphSONMapper.java   |   2 +-
 .../structure/io/graphson/GraphSONModule.java   |   3 +
 .../io/graphson/GraphSONSerializers.java        |  47 ++
 .../gremlin/structure/io/gryo/GryoMapper.java   |  19 +-
 .../util/AbstractThreadLocalTransaction.java    |  40 +-
 .../util/AbstractThreadedTransaction.java       |  44 +-
 .../structure/util/AbstractTransaction.java     |  54 +-
 gremlin-driver/pom.xml                          |   2 +-
 .../apache/tinkerpop/gremlin/driver/Client.java |  24 +
 .../tinkerpop/gremlin/driver/Cluster.java       |  11 +-
 ...raphSONMessageSerializerGremlinV1d0Test.java |  46 +-
 .../ser/GraphSONMessageSerializerV1d0Test.java  |  58 +-
 .../ser/GryoMessageSerializerV1d0Test.java      |  31 +
 gremlin-groovy-test/pom.xml                     |   2 +-
 .../step/sideEffect/GroovyExplainTest.groovy    |  35 ++
 .../step/sideEffect/GroovyGroupCountTest.groovy |   5 +
 .../step/sideEffect/GroovyGroupTestV3d0.groovy  |   8 +-
 .../process/GroovyProcessComputerSuite.java     |   2 +
 .../process/GroovyProcessStandardSuite.java     |   2 +
 gremlin-groovy/pom.xml                          |   2 +-
 .../gremlin/groovy/plugin/Artifact.java         |  10 +-
 .../gremlin/groovy/plugin/ArtifactTest.java     |  87 +++
 .../groovy/util/DependencyGrabberTest.java      |   2 +
 gremlin-server/pom.xml                          |   2 +-
 gremlin-server/scripts/generate-modern.groovy   |   2 +-
 .../server/GremlinDriverIntegrateTest.java      |   7 +-
 .../server/GremlinResultSetIntegrateTest.java   |  29 +
 gremlin-shaded/pom.xml                          |   2 +-
 gremlin-test/pom.xml                            |   2 +-
 .../process/AbstractGremlinProcessTest.java     |  14 +-
 .../gremlin/process/ProcessComputerSuite.java   |   2 +
 .../gremlin/process/ProcessStandardSuite.java   |   2 +
 .../traversal/step/sideEffect/ExplainTest.java  |  85 +++
 .../step/sideEffect/GroupCountTest.java         |  32 +-
 .../step/sideEffect/GroupTestV3d0.java          |  16 +-
 .../gremlin/structure/TransactionTest.java      |  84 +++
 hadoop-gremlin/pom.xml                          |  26 +-
 .../gremlin/hadoop/structure/HadoopGraph.java   |  17 +-
 neo4j-gremlin/pom.xml                           |   2 +-
 pom.xml                                         |  26 +-
 spark-gremlin/pom.xml                           |   2 +-
 tinkergraph-gremlin/pom.xml                     |   2 +-
 .../structure/TinkerGraphPlayTest.java          |   4 +-
 80 files changed, 2079 insertions(+), 254 deletions(-)
----------------------------------------------------------------------