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 2021/06/15 13:41:06 UTC

[tinkerpop] branch TINKERPOP-2534 updated (844efbe -> b34b02d)

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

spmallette pushed a change to branch TINKERPOP-2534
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.


 discard 844efbe  TINKERPOP-2534 wip
     add 7872ece  Bump xunit.runner.visualstudio from 2.2.0 to 2.4.3 in /gremlin-dotnet
     add 3648b2e  Merge branch 'dependabot/nuget/gremlin-dotnet/3.5-dev/xunit.runner.visualstudio-2.4.3' into 3.5-dev
     add 3753d66  Merge branch '3.5-dev'
     add 2424dbd  Bump Microsoft.NET.Test.Sdk from 15.3.0 to 16.10.0 in /gremlin-dotnet
     add 95612c7  Merge branch 'dependabot/nuget/gremlin-dotnet/3.5-dev/Microsoft.NET.Test.Sdk-16.10.0' into 3.5-dev
     add 59d1de4  Merge branch '3.5-dev'
     add d57c58b  Fixed docker image related to python build failures given an underlying push to pypi CTR
     add ee8ba14  Merge branch '3.4-dev' into 3.5-dev
     add a7181e2  Merge branch '3.5-dev'
     add b34b02d  TINKERPOP-2534 Switched test/distribution logging to logback

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (844efbe)
            \
             N -- N -- N   refs/heads/TINKERPOP-2534 (b34b02d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 CHANGELOG.asciidoc                                 |  1 +
 docker/Dockerfile                                  |  6 +++-
 docs/src/upgrade/index.asciidoc                    |  2 ++
 docs/src/upgrade/release-3.6.x.asciidoc            | 38 ++++++++++++++++++++++
 gremlin-console/conf/logback.xml                   |  2 +-
 .../Gremlin.Net.IntegrationTest.csproj             |  4 +--
 .../Gremlin.Net.Template.IntegrationTest.csproj    |  4 +--
 .../Gremlin.Net.UnitTest.csproj                    |  4 +--
 .../WebSocketClientBehaviorIntegrateTest.java      |  2 +-
 gremlin-driver/src/test/resources/logback-test.xml |  2 ++
 gremlin-server/conf/logback.xml                    | 16 +++++++++
 11 files changed, 72 insertions(+), 9 deletions(-)
 create mode 100644 docs/src/upgrade/release-3.6.x.asciidoc