tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ok...@apache.org
Subject [50/50] incubator-tinkerpop git commit: Merge branch 'master' into TINKERPOP3-982
Date Thu, 03 Dec 2015 16:43:46 GMT
Merge branch 'master' into TINKERPOP3-982


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

Branch: refs/heads/TINKERPOP3-982
Commit: 8662fcb8eb24329da99908cff0194c1d81bbefae
Parents: 8d04c82 cdc063a
Author: Marko A. Rodriguez <okrammarko@gmail.com>
Authored: Thu Dec 3 09:42:34 2015 -0700
Committer: Marko A. Rodriguez <okrammarko@gmail.com>
Committed: Thu Dec 3 09:42:34 2015 -0700

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   8 +-
 CONTRIBUTING.asciidoc                           |   2 +-
 README.asciidoc                                 |   2 +-
 docs/javadoc/overview.html                      |   2 +-
 docs/src/dev/developer/administration.asciidoc  |   2 +-
 docs/src/dev/developer/contributing.asciidoc    |   6 +-
 docs/src/dev/developer/release.asciidoc         |  15 +-
 .../src/reference/gremlin-applications.asciidoc |  21 +-
 docs/src/reference/the-graph.asciidoc           |  28 ++-
 docs/src/reference/the-graphcomputer.asciidoc   |  13 +-
 docs/src/reference/the-traversal.asciidoc       |   2 +-
 .../tutorials/getting-started/index.asciidoc    |  58 ++---
 .../upgrade/release-3.0.x-incubating.asciidoc   |   8 +-
 .../upgrade/release-3.1.x-incubating.asciidoc   |  85 ++++++-
 docs/static/images/gremlin-plane.png            | Bin 0 -> 89464 bytes
 .../process/computer/GiraphGraphComputer.java   |  11 +-
 .../bulkloading/BulkLoaderVertexProgram.java    |   4 +-
 .../gremlin/process/traversal/Traverser.java    |   9 +
 .../process/traversal/step/map/MatchStep.java   |  56 +++--
 .../traversal/step/util/ComputerAwareStep.java  |   2 +-
 .../traversal/traverser/O_Traverser.java        |  37 +++
 .../traverser/util/EmptyTraverser.java          |   6 +
 .../tinkerpop/gremlin/structure/Graph.java      |  18 +-
 .../tinkerpop/gremlin/structure/Property.java   |   6 +-
 .../gremlin/structure/Transaction.java          |   2 +-
 .../structure/io/graphson/GraphSONReader.java   |   4 +-
 .../structure/io/graphson/GraphSONTokens.java   |   2 +
 .../structure/io/graphson/GraphSONUtil.java     |  10 +-
 .../structure/io/graphson/GraphSONWriter.java   |   2 +-
 .../traversal/step/map/MatchStepTest.java       |  15 +-
 .../apache/tinkerpop/gremlin/driver/Client.java |  41 +++-
 .../loaders/SugarLoaderPerformanceTest.groovy   |   8 +-
 .../traversal/step/map/GroovyAddEdgeTest.groovy |   4 +-
 .../GremlinGroovyScriptEngineOverGraphTest.java |   8 +-
 gremlin-server/conf/gremlin-server-min.yaml     |   4 +-
 gremlin-server/conf/gremlin-server-neo4j.yaml   |   8 +-
 .../conf/gremlin-server-rest-modern.yaml        |   4 +-
 .../conf/gremlin-server-rest-secure.yaml        |  11 +-
 gremlin-server/conf/gremlin-server-secure.yaml  |  11 +-
 gremlin-server/conf/gremlin-server-spark.yaml   |   8 +-
 gremlin-server/conf/gremlin-server.yaml         |   8 +-
 .../conf/tinkergraph-credentials.properties     |  20 ++
 .../tinkerpop/gremlin/server/GremlinServer.java |   9 +-
 .../server/auth/SimpleAuthenticator.java        |  30 ++-
 .../server/op/AbstractEvalOpProcessor.java      |   6 +-
 .../server/op/standard/StandardOpProcessor.java |  35 ++-
 .../server/util/ServerGremlinExecutor.java      |  34 ++-
 .../server/GremlinResultSetIntegrateTest.java   |  25 +-
 .../GremlinServerAuthIntegrateOldTest.java      | 235 +++++++++++++++++++
 .../server/GremlinServerAuthIntegrateTest.java  |   4 +-
 .../server/GremlinServerHttpIntegrateTest.java  |  73 ++++++
 .../server/gremlin-server-integration.yaml      |   4 +-
 .../process/traversal/step/map/AddEdgeTest.java |   8 +-
 .../gremlin/structure/VertexPropertyTest.java   |  14 +-
 .../computer/util/ComputerSubmissionHelper.java |  80 +++++++
 .../gremlin/neo4j/structure/Neo4jEdge.java      |   2 +-
 .../neo4j/structure/Neo4jGraphVariables.java    |   2 +-
 .../structure/trait/MultiMetaNeo4jTrait.java    |   2 +-
 .../trait/NoMultiNoMetaNeo4jTrait.java          |   2 +-
 pom.xml                                         |   8 +-
 .../process/computer/SparkGraphComputer.java    |   9 +-
 .../tinkergraph/structure/TinkerIoRegistry.java | 176 +++++++++++++-
 .../TinkerGraphGryoSerializerTest.java          |  81 +++++++
 .../structure/TinkerGraphSerializerTest.java    |  81 -------
 .../tinkergraph/structure/TinkerGraphTest.java  |  34 +++
 65 files changed, 1211 insertions(+), 314 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8662fcb8/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------


Mime
View raw message