You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by fl...@apache.org on 2022/10/26 13:28:04 UTC

[tinkerpop] branch 3.6-dev updated (06e8cc6a69 -> f88755a418)

This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a change to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


    from 06e8cc6a69 resolve merge conflict
     add bb96489031 TINKERPOP-2471 Add logging to .NET
     add d66ce688ed Merge pull request #1827 from apache/TINKERPOP-2471
     add f88755a418 Merge branch '3.5-dev' into 3.6-dev

No new revisions were added by this update.

Summary of changes:
 CHANGELOG.asciidoc                                 |  1 +
 docs/src/reference/gremlin-variants.asciidoc       | 11 +++
 docs/src/upgrade/release-3.5.x.asciidoc            | 18 ++++
 .../Gremlin.Net.Template.csproj                    |  3 +-
 gremlin-dotnet/src/Gremlin.Net.Template/Program.cs | 20 +++--
 .../src/Gremlin.Net/Driver/ConnectionPool.cs       | 16 +++-
 .../src/Gremlin.Net/Driver/GremlinClient.cs        | 23 +++--
 gremlin-dotnet/src/Gremlin.Net/Driver/Log.cs       | 46 ++++++++++
 .../Driver/Remote/DriverRemoteConnection.cs        | 69 +++++++--------
 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj  |  3 +-
 .../src/Gremlin.Net/Process/Traversal/Bytecode.cs  |  6 ++
 .../Gremlin.Net/Process/Traversal/Instruction.cs   |  2 +-
 gremlin-dotnet/src/pom.xml                         |  2 +-
 .../Docs/Reference/GremlinVariantsTests.cs         | 15 +++-
 .../Driver/DriverRemoteConnectionTests.cs          | 97 ++++++++++++++++++++++
 .../Driver/GremlinClientTests.cs                   | 30 +++++++
 .../Driver/MockedLoggerExtensions.cs}              | 38 ++++-----
 .../Gremlin.Net.IntegrationTest.csproj             |  2 +
 .../Driver/ConnectionPoolTests.cs                  | 12 +--
 .../Process/Traversal/BytecodeTests.cs             | 14 ++++
 20 files changed, 346 insertions(+), 82 deletions(-)
 create mode 100644 gremlin-dotnet/src/Gremlin.Net/Driver/Log.cs
 create mode 100644 gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/DriverRemoteConnectionTests.cs
 copy gremlin-dotnet/test/{Gremlin.Net.UnitTest/Driver/DriverRemoteConnectionTests.cs => Gremlin.Net.IntegrationTest/Driver/MockedLoggerExtensions.cs} (51%)