You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/10/24 17:33:31 UTC

[48/50] tinkerpop git commit: Merge branch 'master' into TINKERPOP-1389

Merge branch 'master' into TINKERPOP-1389


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

Branch: refs/heads/TINKERPOP-1389
Commit: f7dc110dff78992c77f64c3ed84466018de09344
Parents: 302df7c 8536723
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Oct 24 11:06:32 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Oct 24 11:06:32 2016 -0600

----------------------------------------------------------------------
 .gitignore                                      |    2 +-
 CHANGELOG.asciidoc                              |  163 +-
 appveyor.yml                                    |   14 -
 bin/gremlin.sh                                  |   23 +-
 bin/publish-docs.awk                            |   31 +
 bin/publish-docs.sh                             |   56 +-
 docs/preprocessor/awk/init-code-blocks.awk      |  107 +-
 docs/preprocessor/preprocess-file.sh            |    2 +-
 docs/src/dev/developer/contributing.asciidoc    |   12 +-
 .../developer/development-environment.asciidoc  |   19 +-
 docs/src/dev/developer/for-committers.asciidoc  |   96 +-
 docs/src/dev/developer/release.asciidoc         |   52 +-
 docs/src/dev/io/graphml.asciidoc                |  119 +
 docs/src/dev/io/graphson.asciidoc               | 4651 ++++++++++++++++++
 docs/src/dev/io/gryo.asciidoc                   |   63 +
 docs/src/dev/io/index.asciidoc                  |   37 +
 docs/src/dev/provider/index.asciidoc            |   16 +-
 docs/src/index.asciidoc                         |    4 +
 docs/src/recipes/between-vertices.asciidoc      |    2 +-
 docs/src/recipes/centrality.asciidoc            |   24 +-
 docs/src/recipes/cycle-detection.asciidoc       |   30 +-
 docs/src/recipes/index.asciidoc                 |   12 +-
 docs/src/recipes/pagination.asciidoc            |   79 +
 docs/src/recipes/recommendation.asciidoc        |  248 +
 docs/src/recipes/shortest-path.asciidoc         |   44 +-
 .../recipes/traversal-induced-values.asciidoc   |   34 +-
 docs/src/recipes/tree.asciidoc                  |  218 +
 .../src/reference/gremlin-applications.asciidoc |   70 +-
 docs/src/reference/gremlin-variants.asciidoc    |   72 +-
 .../reference/implementations-hadoop.asciidoc   |    2 +-
 .../reference/implementations-neo4j.asciidoc    |    3 +-
 .../implementations-tinkergraph.asciidoc        |    2 +-
 docs/src/reference/intro.asciidoc               |   16 +-
 docs/src/reference/the-graph.asciidoc           |    4 +-
 docs/src/reference/the-graphcomputer.asciidoc   |   15 +-
 docs/src/reference/the-traversal.asciidoc       |  234 +-
 .../tutorials/getting-started/index.asciidoc    |    4 +-
 docs/src/upgrade/index.asciidoc                 |    4 +-
 .../upgrade/release-3.1.x-incubating.asciidoc   |   19 +-
 .../upgrade/release-3.2.x-incubating.asciidoc   |  280 +-
 docs/src/upgrade/release-3.3.x.asciidoc         |   29 +
 docs/static/images/gremlin-groovy-drawing.png   |  Bin 0 -> 133892 bytes
 docs/static/images/gremlin-index-time.png       |  Bin 0 -> 53361 bytes
 docs/static/images/gremlin-io2.png              |  Bin 0 -> 185756 bytes
 docs/static/images/gremlin-max-depth.png        |  Bin 0 -> 109506 bytes
 docs/static/images/gremlin-mozart.png           |  Bin 0 -> 44484 bytes
 docs/static/images/gremlin-paging.png           |  Bin 0 -> 248956 bytes
 docs/static/images/gremlin-recommendation.png   |  Bin 0 -> 61405 bytes
 docs/static/images/gremlin-tree.png             |  Bin 0 -> 229528 bytes
 docs/static/images/recommendation-alice-1.png   |  Bin 0 -> 11028 bytes
 docs/static/images/recommendation-alice-2.png   |  Bin 0 -> 28186 bytes
 docs/static/images/recommendation-alice-3.png   |  Bin 0 -> 54869 bytes
 docs/static/images/recommendation-alice-4.png   |  Bin 0 -> 46685 bytes
 docs/static/images/tinkerpop3.graffle           | 4518 ++++++++++++++++-
 docs/static/images/tree-lca.png                 |  Bin 0 -> 27172 bytes
 giraph-gremlin/pom.xml                          |   21 +-
 .../gremlin-archetype-server/pom.xml            |    2 +-
 .../gremlin-archetype-tinkergraph/pom.xml       |    2 +-
 gremlin-archetype/pom.xml                       |    2 +-
 gremlin-benchmark/pom.xml                       |  136 -
 .../benchmark/util/AbstractBenchmarkBase.java   |  117 -
 .../benchmark/util/AbstractGraphBenchmark.java  |   85 -
 .../util/AbstractGraphMutateBenchmark.java      |   48 -
 .../gremlin/process/GraphMutateBenchmark.java   |   92 -
 .../process/GraphTraversalBenchmark.java        |  101 -
 gremlin-console/bin/gremlin.sh                  |   25 +-
 gremlin-console/pom.xml                         |   23 +-
 gremlin-console/src/main/bin/gremlin.sh         |   28 +-
 .../tinkerpop/gremlin/console/Console.groovy    |   24 +-
 .../gremlin/console/Preferences.groovy          |   12 +-
 .../console/commands/GremlinSetCommand.groovy   |    2 +-
 gremlin-core/pom.xml                            |   10 +-
 .../gremlin/jsr223/JavaTranslator.java          |  139 +-
 .../gremlin/process/computer/Computer.java      |   17 +
 .../gremlin/process/computer/MapReduce.java     |    2 +-
 .../gremlin/process/computer/VertexProgram.java |   11 +
 .../computer/traversal/MasterExecutor.java      |    9 +-
 .../computer/traversal/WorkerExecutor.java      |    4 +-
 .../step/map/ProgramVertexProgramStep.java      |    9 +
 .../traversal/step/map/VertexProgramStep.java   |    2 +-
 .../decoration/VertexProgramStrategy.java       |  149 +-
 .../computer/util/GraphComputerHelper.java      |    1 +
 .../process/remote/RemoteConnection.java        |    2 +-
 .../gremlin/process/remote/RemoteGraph.java     |   44 +-
 .../traversal/AbstractRemoteTraversal.java      |   17 +
 .../remote/traversal/RemoteTraversal.java       |   18 +
 .../traversal/RemoteTraversalSideEffects.java   |   19 +-
 .../remote/traversal/step/map/RemoteStep.java   |    5 -
 .../gremlin/process/traversal/Bindings.java     |    5 +
 .../gremlin/process/traversal/Bytecode.java     |   86 +-
 .../gremlin/process/traversal/Traversal.java    |    7 +-
 .../process/traversal/TraversalSideEffects.java |    9 +-
 .../process/traversal/TraversalSource.java      |   74 +-
 .../process/traversal/TraversalStrategies.java  |    7 +-
 .../process/traversal/TraversalStrategy.java    |   13 +
 .../traversal/dsl/graph/GraphTraversal.java     |   12 +-
 .../dsl/graph/GraphTraversalSource.java         |   49 +-
 .../lambda/AbstractLambdaTraversal.java         |   70 +-
 .../traversal/lambda/ElementValueTraversal.java |   12 +-
 .../process/traversal/step/GraphComputing.java  |   29 +
 .../traversal/step/HasContainerHolder.java      |    4 +
 .../traversal/step/branch/RepeatStep.java       |    1 +
 .../process/traversal/step/filter/AndStep.java  |   19 +-
 .../traversal/step/filter/ClassFilterStep.java  |   51 +
 .../traversal/step/filter/ConnectiveStep.java   |    2 +-
 .../traversal/step/filter/DedupGlobalStep.java  |   12 +-
 .../process/traversal/step/filter/HasStep.java  |   11 +-
 .../process/traversal/step/filter/NotStep.java  |    9 +-
 .../process/traversal/step/filter/OrStep.java   |   14 +-
 .../step/filter/WherePredicateStep.java         |   54 +-
 .../process/traversal/step/map/HasNextStep.java |    8 +-
 .../process/traversal/step/map/MatchStep.java   |    2 +-
 .../process/traversal/step/map/PathStep.java    |    2 +-
 .../process/traversal/step/map/ProjectStep.java |    2 +-
 .../traversal/step/map/PropertyMapStep.java     |  101 +-
 .../process/traversal/step/map/SelectStep.java  |    2 +-
 .../process/traversal/step/map/TreeStep.java    |    2 +-
 .../step/sideEffect/TreeSideEffectStep.java     |    2 +-
 .../strategy/TraversalStrategyProxy.java        |   51 +
 .../strategy/decoration/ConnectiveStrategy.java |   13 +-
 .../strategy/decoration/ElementIdStrategy.java  |   27 +-
 .../decoration/HaltedTraverserStrategy.java     |   23 +
 .../strategy/decoration/PartitionStrategy.java  |   79 +-
 .../strategy/decoration/SubgraphStrategy.java   |  246 +-
 .../finalization/LazyBarrierStrategy.java       |   31 +-
 .../finalization/MatchAlgorithmStrategy.java    |   20 +
 .../optimization/FilterRankingStrategy.java     |  150 +-
 .../optimization/IdentityRemovalStrategy.java   |   14 +-
 .../IncidentToAdjacentStrategy.java             |    4 +-
 .../optimization/InlineFilterStrategy.java      |  296 ++
 .../optimization/LazyBarrierStrategy.java       |  111 +
 .../optimization/MatchPredicateStrategy.java    |   62 +-
 .../optimization/PathRetractionStrategy.java    |    4 +-
 .../optimization/RangeByIsCountStrategy.java    |   20 +-
 .../optimization/RepeatUnrollStrategy.java      |   17 +-
 .../StandardVerificationStrategy.java           |   14 +-
 .../traversal/traverser/util/TraverserSet.java  |    6 +-
 .../gremlin/process/traversal/util/AndP.java    |    8 +-
 .../process/traversal/util/ConnectiveP.java     |    3 +-
 .../util/DefaultTraversalStrategies.java        |   11 +-
 .../gremlin/process/traversal/util/OrP.java     |    9 +-
 .../process/traversal/util/TraversalHelper.java |  162 +-
 .../process/traversal/util/TraversalRing.java   |    2 +-
 .../tinkerpop/gremlin/structure/Graph.java      |   12 +
 .../structure/io/graphson/GraphSONModule.java   |   86 +-
 .../structure/io/graphson/GraphSONReader.java   |    4 +
 .../io/graphson/GraphSONSerializerProvider.java |   14 +-
 .../GraphSONTraversalSerializersV2d0.java       |   36 +
 .../io/graphson/GraphSONTypeSerializer.java     |    3 +
 .../structure/io/gryo/EntrySerializer.java      |   43 -
 .../structure/io/gryo/GryoClassResolver.java    |    3 +
 .../gremlin/structure/io/gryo/GryoMapper.java   |   35 +-
 .../gremlin/structure/io/gryo/GryoReader.java   |    4 +
 .../structure/io/gryo/GryoSerializers.java      |  173 +-
 .../structure/io/gryo/PairSerializer.java       |   45 -
 .../structure/io/gryo/URISerializer.java        |   49 -
 .../structure/io/gryo/UUIDSerializer.java       |   50 -
 .../structure/io/gryo/UtilSerializers.java      |  140 +
 .../tinkerpop/gremlin/util/CoreImports.java     |    2 +-
 .../gremlin/process/traversal/BytecodeTest.java |  119 +
 .../gremlin/process/traversal/PTest.java        |  245 +-
 .../dsl/graph/GraphTraversalSourceTest.java     |   81 +
 .../traversal/step/filter/HasStepTest.java      |   66 +
 .../traversal/step/filter/WhereStepTest.java    |    6 +-
 .../decoration/SubgraphStrategyTest.java        |  159 +-
 .../finalization/LazyBarrierStrategyTest.java   |   74 -
 .../optimization/FilterRankingStrategyTest.java |   78 +-
 .../IncidentToAdjacentStrategyTest.java         |   16 +-
 .../optimization/InlineFilterStrategyTest.java  |  138 +
 .../optimization/LazyBarrierStrategyTest.java   |  107 +
 .../MatchPredicateStrategyTest.java             |  121 +-
 .../PathRetractionStrategyTest.java             |   16 +-
 .../RangeByIsCountStrategyTest.java             |    2 +
 .../optimization/RepeatUnrollStrategyTest.java  |   67 +-
 .../process/util/TraversalHelperTest.java       |   87 +-
 ...aphSONMapperV2d0PartialEmbeddedTypeTest.java |    2 +-
 .../util/iterator/IteratorUtilsTest.java        |   12 +-
 gremlin-driver/pom.xml                          |   10 +-
 gremlin-driver/src/main/bin/config-eval.sh      |    4 +-
 gremlin-driver/src/main/bin/profile-driver.sh   |    4 +-
 .../tinkerpop/gremlin/driver/Channelizer.java   |   41 +-
 .../apache/tinkerpop/gremlin/driver/Client.java |   42 +-
 .../tinkerpop/gremlin/driver/Cluster.java       |  105 +-
 .../tinkerpop/gremlin/driver/Connection.java    |  110 +-
 .../gremlin/driver/ConnectionPool.java          |   23 +-
 .../tinkerpop/gremlin/driver/Handler.java       |   26 +-
 .../apache/tinkerpop/gremlin/driver/Host.java   |    2 +-
 .../gremlin/driver/LoadBalancingStrategy.java   |    2 +-
 .../tinkerpop/gremlin/driver/ResultQueue.java   |    4 +
 .../tinkerpop/gremlin/driver/Settings.java      |   12 +-
 .../driver/handler/WebSocketClientHandler.java  |    5 +-
 .../WebSocketGremlinResponseDecoder.java        |    5 +-
 .../driver/remote/DriverRemoteTraversal.java    |   22 +-
 .../DriverRemoteTraversalSideEffects.java       |   75 +-
 .../AbstractGraphSONMessageSerializerV1d0.java  |   14 +-
 .../AbstractGraphSONMessageSerializerV2d0.java  |   15 +-
 .../GraphSONMessageSerializerGremlinV1d0.java   |    4 +-
 .../GraphSONMessageSerializerGremlinV2d0.java   |    8 +-
 .../ser/GraphSONMessageSerializerV1d0.java      |    4 +-
 .../ser/GraphSONMessageSerializerV2d0.java      |    8 +-
 .../gremlin/driver/ClusterBuilderTest.java      |   88 +
 .../DriverRemoteTraversalSideEffectsTest.java   |  116 +
 ...raphSONMessageSerializerGremlinV2d0Test.java |    1 +
 .../ser/GraphSONMessageSerializerV2d0Test.java  |   24 +
 gremlin-groovy-test/pom.xml                     |   20 +-
 .../step/branch/GroovyChooseTest.groovy         |    5 +
 .../step/filter/GroovyDedupTest.groovy          |   19 +
 .../step/filter/GroovyWhereTest.groovy          |   15 +
 .../traversal/step/map/GroovyMatchTest.groovy   |   10 +
 .../traversal/step/map/GroovyVertexTest.groovy  |    5 +
 .../groovy/jsr223/GroovyTranslatorTest.java     |   35 +-
 .../process/GroovyProcessComputerSuite.java     |    2 +-
 gremlin-groovy/pom.xml                          |   21 +-
 .../gremlin/groovy/engine/GremlinExecutor.java  |    2 +-
 .../jsr223/GremlinGroovyScriptEngine.java       |  142 +-
 .../gremlin/groovy/jsr223/GroovyTranslator.java |   61 +-
 .../plugin/dsl/credential/CredentialGraph.java  |    3 +-
 .../groovy/engine/GremlinExecutorTest.java      |   11 +-
 .../jsr223/GremlinGroovyScriptEngineTest.java   |   69 +-
 .../util/DependencyGrabberIntegrateTest.java    |  102 +
 .../groovy/util/DependencyGrabberTest.java      |  102 -
 gremlin-python/pom.xml                          |   88 +-
 .../python/GraphTraversalSourceGenerator.groovy |   11 +-
 .../python/TraversalSourceGenerator.groovy      |   55 +-
 .../jsr223/GremlinJythonScriptEngine.java       |    4 +-
 .../gremlin/python/jsr223/PythonTranslator.java |   50 +-
 .../driver/driver_remote_connection.py          |   40 +-
 .../gremlin_python/driver/remote_connection.py  |   30 +-
 .../gremlin_python/process/graph_traversal.py   |   10 +-
 .../jython/gremlin_python/process/strategies.py |  183 +
 .../jython/gremlin_python/process/traversal.py  |   56 +-
 .../src/main/jython/gremlin_python/statics.py   |   18 +
 .../jython/gremlin_python/structure/graph.py    |   32 +
 .../gremlin_python/structure/io/graphson.py     |  500 +-
 gremlin-python/src/main/jython/setup.py         |   14 +-
 .../driver/test_driver_remote_connection.py     |   87 +-
 .../jython/tests/process/test_strategies.py     |  106 +
 .../main/jython/tests/process/test_traversal.py |    8 +
 .../jython/tests/structure/io/test_graphson.py  |  131 +-
 .../main/jython/tests/structure/test_graph.py   |   56 +-
 .../python/jsr223/JythonScriptEngineSetup.java  |    5 +-
 .../python/jsr223/JythonTranslatorTest.java     |   34 +
 .../jsr223/PythonGraphSONJavaTranslator.java    |    2 +-
 .../gremlin/python/jsr223/PythonProvider.java   |    3 -
 .../io/graphson/GraphSONReaderTest.java         |   68 +-
 .../io/graphson/GraphSONWriterTest.java         |   56 +-
 gremlin-server/conf/gremlin-server-classic.yaml |    2 +-
 gremlin-server/pom.xml                          |    3 +-
 gremlin-server/src/main/bin/gremlin-server.sh   |    4 +-
 .../gremlin/server/AbstractChannelizer.java     |    2 +-
 .../server/auth/AllowAllAuthenticator.java      |    1 -
 .../server/auth/SimpleAuthenticator.java        |    1 -
 .../gremlin/server/channel/HttpChannelizer.java |    2 +-
 .../handler/HttpBasicAuthenticationHandler.java |    2 +-
 .../handler/HttpGremlinEndpointHandler.java     |   15 +-
 .../gremlin/server/op/session/Session.java      |   12 +
 .../server/op/session/SessionOpProcessor.java   |    9 +
 .../op/traversal/TraversalOpProcessor.java      |  157 +-
 .../gremlin/server/util/TraversalIterator.java  |   60 -
 .../gremlin/server/util/TraverserIterator.java  |   58 +
 .../AbstractGremlinServerIntegrationTest.java   |    2 +-
 .../server/GremlinDriverIntegrateTest.java      |  189 +-
 .../server/GremlinResultSetIntegrateTest.java   |   12 -
 .../server/GremlinServerAuthIntegrateTest.java  |    5 +-
 .../GremlinServerAuthOldIntegrateTest.java      |    4 +-
 .../server/GremlinServerIntegrateTest.java      |  116 +-
 .../GremlinServerSessionIntegrateTest.java      |   39 +-
 gremlin-shaded/pom.xml                          |    2 +-
 gremlin-test/pom.xml                            |   47 +-
 .../process/AbstractGremlinProcessTest.java     |   29 +-
 .../gremlin/process/GremlinProcessRunner.java   |    3 +-
 .../process/computer/GraphComputerTest.java     |  246 +-
 .../traversal/TraversalInterruptionTest.java    |    6 +-
 .../traversal/step/branch/ChooseTest.java       |   22 +-
 .../traversal/step/filter/DedupTest.java        |   80 +
 .../traversal/step/filter/WhereTest.java        |  104 +-
 .../process/traversal/step/map/MapTest.java     |    4 +-
 .../process/traversal/step/map/MatchTest.java   |   17 +
 .../process/traversal/step/map/OrderTest.java   |   94 +-
 .../process/traversal/step/map/VertexTest.java  |   21 +-
 .../PartitionStrategyProcessTest.java           |  118 +-
 .../decoration/SubgraphStrategyProcessTest.java |   80 +-
 .../decoration/TranslationStrategy.java         |   10 +-
 .../ReadOnlyStrategyProcessTest.java            |    3 +-
 .../tinkerpop/gremlin/structure/GraphTest.java  |    6 +-
 .../gremlin/structure/TransactionTest.java      |    3 +-
 gremlin-tools/gremlin-benchmark/pom.xml         |  134 +
 .../benchmark/util/AbstractBenchmarkBase.java   |  117 +
 .../benchmark/util/AbstractGraphBenchmark.java  |   85 +
 .../util/AbstractGraphMutateBenchmark.java      |   48 +
 .../gremlin/process/GraphMutateBenchmark.java   |   92 +
 .../process/GraphTraversalBenchmark.java        |  101 +
 gremlin-tools/gremlin-coverage/pom.xml          |  118 +
 gremlin-tools/pom.xml                           |   31 +
 hadoop-gremlin/pom.xml                          |   21 +-
 .../computer/util/ComputerSubmissionHelper.java |    2 +-
 neo4j-gremlin/pom.xml                           |   21 +-
 .../optimization/Neo4jGraphStepStrategy.java    |   25 +-
 .../gremlin/neo4j/structure/Neo4jGraph.java     |    2 +-
 .../traversal/strategy/Neo4jStrategySuite.java  |   44 -
 .../traversal/strategy/Neo4jStrategyTest.java   |   32 -
 .../Neo4jGraphStepStrategyTest.java             |  139 +-
 pom.xml                                         |  243 +-
 spark-gremlin/pom.xml                           |   48 +-
 tinkergraph-gremlin/pom.xml                     |    3 +-
 .../optimization/TinkerGraphStepStrategy.java   |   25 +-
 .../tinkergraph/structure/TinkerGraph.java      |    4 +-
 .../structure/TinkerIoRegistryV2d0.java         |    2 +-
 .../process/TinkerGraphComputerProvider.java    |   12 +-
 .../TinkerGraphGroovyTranslatorProvider.java    |    6 +
 .../TinkerGraphJavaTranslatorProvider.java      |    3 +
 .../strategy/TinkerGraphStrategySuite.java      |   44 -
 .../strategy/TinkerGraphStrategyTest.java       |   32 -
 .../decoration/HaltedTraverserStrategyTest.java |   11 +-
 .../TinkerGraphStepStrategyTest.java            |  144 +-
 .../structure/TinkerGraphPlayTest.java          |   59 +-
 .../tinkergraph/structure/TinkerGraphTest.java  |   39 +
 .../io/graphson/GraphSONTranslator.java         |    3 +-
 .../TinkerGraphGraphSONTranslatorProvider.java  |    3 -
 .../structure/io/gryo/GryoTranslator.java       |   72 +
 ...nkerGraphGryoTranslatorComputerProvider.java |   38 +
 ...rGraphGryoTranslatorProcessComputerTest.java |   33 +
 ...rGraphGryoTranslatorProcessStandardTest.java |   33 +
 .../gryo/TinkerGraphGryoTranslatorProvider.java |   72 +
 324 files changed, 19544 insertions(+), 3789 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7dc110d/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 489301a,ed73100..db7ade7
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -22,12 -22,137 +22,139 @@@ TinkerPop 3.2.0 (Nine Inch Gremlins
  
  image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/nine-inch-gremlins.png[width=185]
  
- [[release-3-2-3]]
- TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
+ [[release-3-3-0]]
+ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
 +* Bumped to support Spark 2.0.0.
+ * Replaced term `REST` with `HTTP` to remove any confusion as to the design of the API.
+ * Moved `gremlin-benchmark` under `gremlin-tools` module.
+ * Added `gremlin-tools` and its submodule `gremlin-coverage`.
+ * Changed `gremlin-benchmark` system property for the report location to `benchmarkReportDir` for consistency.
+ 
+ [[release-3-2-3]]
+ TinkerPop 3.2.3 (Release Date: October 17, 2016)
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
+ This release also includes changes from <<release-3-1-5, 3.1.5>>.
+ 
+ * Restructured Gremlin-Python's GraphSON I/O package to make it easier for users to register serializers/deserializers. (*breaking*)
+ * Fixed a bug with `TraversalOpProcessor` that was returning a final result prior to committing the transaction.
+ * Fixed a bug in `ConnectiveStrategy` where infix and/or was not correctly reasoning on `choose()` `HasNextStep` injections.
+ * Increased performance of `CredentialGraph` authentication.
+ * Removed Java 8 stream usage from `TraversalHelper` for performance reasons.
+ * Fixed a bug in `RepeatStep` where `emit().as('x')` wasn't adding the step labels to the emit-traverser.
+ * Added `GraphComputing.atMaster(boolean)` to allow steps to know whether they are executing at master or distributed at workers.
+ * Fixed a bug in OLAP where `DedupGlobalStep` wasn't de-duping local master traversers.
+ * Added `HasContainerHolder.removeHasContainer()`-method with default `UnsupportedOperationException` implementation.
+ * `TraversalSource.withComputer()` is simplified to add a `VertexProgramStrategy`. Easier for language variants.
+ * Fixed a `Set`, `List`, `Map` bug in the various `Translators` where such collections were not being internally translated.
+ * Fixed a `Bytecode` bug where nested structures (map, list, set) were not being analyzed for bindings and bytecode conversions.
+ * Fixed a `String` bug in `GroovyTranslator` and `PythonTranslator` where if the string has double-quotes it now uses """ """.
+ * Added a default `TraversalStrategy.getConfiguration()` which returns the configuration needed to construct the strategy.
+ * `Computer` instances can be created with `Computer.create(Configuration)` and accessed via `Computer.getConf()`.
+ * Every `TraversalStrategy` can be created via a `Configuration` and a static `MyStrategy.create(Configuration)`.
+ * Added language-agnostic `TraversalStrategy` support in `Bytecode`.
+ * Added `PartitionStrategy.Builder.readPartitions()` and deprecated `PartitionStrategy.Builder.addPartition()`.
+ * A new version of `LazyBarrierStrategy` has been created and added to the default strategies.
+ * `FilterRankStrategy` now propagates labels "right" over non-`Scoping` filters.
+ * Fixed a bug in `ConnectiveP` where nested equivalent connectives should be inlined.
+ * Fixed a bug in `IncidentToAdjacentStrategy` where `TreeStep` traversals were allowed.
+ * Fixed a end-step label bug in `MatchPredicateStrategy`.
+ * Fixed a bug in `MatchPredicateStrategy` where inlined traversals did not have strategies applied to it.
+ * Fixed a bug in `RepeatUnrollStrategy` where inlined traversal did not have strategies applied to it.
+ * Fixed padding of prompt in Gremlin Console when the number of lines went beyond a single digit.
+ * Fixed GraphSON 2.0 namespace for `TinkerGraph` to be "tinker" instead of "gremlin".
+ * Dropped serialization support in GraphSON 2.0 for `Calendar`, `TimeZone`, and `Timestamp`.
+ * Added `TraversalHelper.copyLabels()` for copying (or moving) labels form one step to another.
+ * Added `TraversalHelper.applySingleLevelStrategies()` which will apply a subset of strategies but not walk the child tree.
+ * Added the concept that hidden labels using during traversal compilation are removed at the end during `StandardVerificationStrategy`. (*breaking*)
+ * Added `InlineFilterStrategy` which will determine if various `TraversalParent` children are filters and if so, inline them.
+ * Removed `IdentityRemovalStrategy` from the default listing as its not worth the clock cycles.
+ * Removed the "!" symbol in `NotStep.toString()` as it is confusing and the `NotStep`-name is sufficient.
+ * Fixed a bug in `TraversalVertexProgram` (OLAP) around ordering and connectives (i.e. `and()` and `or()`).
+ * Added `AbstractGremlinProcessTest.checkOrderedResults()` to make testing ordered results easier.
+ * `AbstractLambdaTraversal` now supports a `bypassTraversal` where it is possible for strategies to redefine such lambda traversals.
+ * Added an internal utility `ClassFilterStep` which determines if the traverser object's class is an instance of the provided class.
+ * `ConnectiveStep` extends `FilterStep` and thus, is more appropriately categorized in the step hierarchy.
+ * `PropertyMapStep` supports a provided traversal for accessing the properties of the element. (*breaking*)
+ * `SubgraphStrategy` now supports vertex property filtering.
+ * Fixed a bug in Gremlin-Python `P` where predicates reversed the order of the predicates.
+ * Added tests to `DedupTest` for the `dedup(Scope, String...)` overload.
+ * Added more detailed reference documentation for IO formats.
+ * Fixed a bug in serialization of `Lambda` instances in GraphSON, which prevented their use in remote traversals.
+ * Fixed a naming bug in Gremlin-Python where `P._and` and `P._or` should be `P.and_` and `P.or_`. (*breaking*)
+ * `where()` predicate-based steps now support `by()`-modulation.
+ * Added Gryo serialization for `Bytecode`.
+ * Moved utility-based serializers to `UtilSerializers` for Gryo - these classes were private and hence this change is non-breaking.
+ * `TraversalRing` returns a `null` if it does not contain traversals (previously `IdentityTraversal`).
+ * Deprecated `Graph.Exceptions.elementNotFoundException()` as it was not used in the code base outside of the test suite.
+ * Fixed a `JavaTranslator` bug where `Bytecode` instructions were being mutated during translation.
+ * Added `Path` to Gremlin-Python with respective GraphSON 2.0 deserializer.
+ * `Traversal` and `TraversalSource` now implement `AutoCloseable`.
+ * Added "keep-alive" functionality to the Java driver, which will send a heartbeat to the server when normal request activity on a connection stops for a period of time.
+ * Renamed the `empty.result.indicator` preference to `result.indicator.null` in Gremlin Console
+ * If `result.indicator.null` is set to an empty string, then no "result line" is printed in Gremlin Console.
+ * Deprecated `reconnectInitialDelay` on the Java driver.
+ * Added some validations to `Cluster` instance building.
+ * Produced better errors in `readGraph` of `GryoReader` and `GraphSONReader` if a `Vertex` cannot be found in the cache on edge loading.
+ * VertexPrograms can now declare traverser requirements, e.g. to have access to the path when used with `.program()`.
+ * New build options for `gremlin-python` where `-DglvPython` is no longer required.
++>>>>>>> master
  * Added missing `InetAddress` to GraphSON extension module.
+ * Added new recipe for "Pagination".
+ * Added new recipe for "Recommendation".
+ * Added functionality to Gremlin-Server REST endpoint to forward Exception Messages and Class in HTTP Response
+ * Gremlin Server `TraversalOpProcessor` now returns confirmation upon `Op` `close`.
+ * Added `close` method Java driver and Python driver `DriverRemoteTraversalSideEffects`.
+ 
+ Bugs
+ ^^^^
+ 
+ * TINKERPOP-1423 IncidentToAdjacentStrategy should be disabled for tree steps
+ * TINKERPOP-1440 g:Path needs a GraphSON deserializer in Gremlin-Python
+ * TINKERPOP-1457 Groovy Lambdas for remote traversals not serializable
+ * TINKERPOP-1458 Gremlin Server doesn't return confirmation upon Traversal OpProcessor "close" op
+ * TINKERPOP-1466 PeerPressureTest has been failing recently
+ * TINKERPOP-1472 RepeatUnrollStrategy does not semi-compile inlined repeat traversal
+ * TINKERPOP-1495 Global list deduplication doesn't work in OLAP
+ * TINKERPOP-1500 and/or infix and choose() do not work correctly.
+ * TINKERPOP-1511 Remote client addV, V()
+ 
+ Improvements
+ ^^^^^^^^^^^^
+ 
+ * TINKERPOP-790 Implement AutoCloseable on TraversalSource
+ * TINKERPOP-944 Deprecate Graph.Exceptions.elementNotFound
+ * TINKERPOP-1189 SimpleAuthenticator over HttpChannelizer makes Gremlin Server pretty slow and consumes more CPU
+ * TINKERPOP-1249 Gremlin driver to periodically issue ping / heartbeat to gremlin server
+ * TINKERPOP-1280 VertexPrograms should declare traverser requirements
+ * TINKERPOP-1330 by()-modulation for where()
+ * TINKERPOP-1409 Make the "null" return in the gremlin console into something more understandable  *(breaking)*
+ * TINKERPOP-1431 Documentation generation requires tests to execute on gremlin-python
+ * TINKERPOP-1437 Add tests for dedup(Scope) in DedupTest
+ * TINKERPOP-1444 Benchmark bytecode->Traversal creation and implement GremlinServer cache if necessary.
+ * TINKERPOP-1448 gremlin-python should be Python 2/3 compatible
+ * TINKERPOP-1449 Streamline gremlin-python build
+ * TINKERPOP-1455 Provide String-based withStrategy()/withoutStrategy() for language variant usage
+ * TINKERPOP-1456 Support SubgraphStrategy.vertexProperties().
+ * TINKERPOP-1460 Deprecate reconnectInitialDelay in Java driver
+ * TINKERPOP-1464 Gryo Serialization for Bytecode
+ * TINKERPOP-1469 Get rid of Stream-usage in TraversalHelper
+ * TINKERPOP-1470 InlineFilterStrategy should try and P.or() has() children in OrSteps.
+ * TINKERPOP-1486 Improve API of RemoteConnection
+ * TINKERPOP-1487 Reference Documentation for IO
+ * TINKERPOP-1488 Make LazyBarrierStrategy part of the default TraversalStrategies *(breaking)*
+ * TINKERPOP-1492 RemoteStrategy or the RemoteConnection should append a lazy barrier().
+ * TINKERPOP-1423 IncidentToAdjacentStrategy should be disabled for tree steps
+ * TINKERPOP-1440 g:Path needs a GraphSON deserializer in Gremlin-Python
+ * TINKERPOP-1457 Groovy Lambdas for remote traversals not serializable
+ * TINKERPOP-1458 Gremlin Server doesn't return confirmation upon Traversal OpProcessor "close" op
+ * TINKERPOP-1466 PeerPressureTest has been failing recently
+ * TINKERPOP-1472 RepeatUnrollStrategy does not semi-compile inlined repeat traversal
+ * TINKERPOP-1495 Global list deduplication doesn't work in OLAP
+ * TINKERPOP-1500 and/or infix and choose() do not work correctly.
+ * TINKERPOP-1511 Remote client addV, V()
  
  [[release-3-2-2]]
  TinkerPop 3.2.2 (Release Date: September 6, 2016)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7dc110d/giraph-gremlin/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7dc110d/hadoop-gremlin/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7dc110d/spark-gremlin/pom.xml
----------------------------------------------------------------------