Merge branch 'tp33'

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

Branch: refs/heads/master
Commit: 3e00a64026eb865d90988beddb20b9103a8e83aa
Parents: 5ae66ed 9bd4d7f
Author: Florian Hockmann <f...@florian-hockmann.de>
Authored: Tue Mar 13 23:51:28 2018 +0100
Committer: Florian Hockmann <f...@florian-hockmann.de>
Committed: Tue Mar 13 23:51:28 2018 +0100

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   1 +
 .../upgrade/release-3.2.x-incubating.asciidoc   |  12 +++
 gremlin-dotnet/glv/P.template                   |  62 ++++++++++-
 gremlin-dotnet/glv/generate.groovy              |   2 +-
 .../Process/Traversal/GraphTraversal.cs         |  20 ++--
 .../src/Gremlin.Net/Process/Traversal/P.cs      | 106 ++++++++++++++-----
 .../Process/Traversal/TraversalPredicate.cs     |  85 ---------------
 .../src/Gremlin.Net/Process/Traversal/__.cs     |  20 ++--
 .../Structure/IO/GraphSON/GraphSONWriter.cs     |   2 +-
 .../Structure/IO/GraphSON/PSerializer.cs        |  45 ++++++++
 .../IO/GraphSON/TraversalPredicateSerializer.cs |  45 --------
 .../Gherkin/GherkinTestRunner.cs                |  18 +---
 .../Gherkin/IgnoreException.cs                  |   5 -
 .../Gherkin/TraversalEvaluation/PParameter.cs   |  97 +++++++++++++++++
 .../TraversalEvaluationTests.cs                 |   2 +-
 .../TraversalEvaluation/TraversalParser.cs      |   2 +-
 .../TraversalPredicateParameter.cs              |  93 ----------------
 .../GraphSON/BytecodeGraphSONSerializerTests.cs |   2 +-
 .../IO/GraphSON/GraphSONWriterTests.cs          |   4 +-
 19 files changed, 323 insertions(+), 300 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3e00a640/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
----------------------------------------------------------------------

Reply via email to