This is an automated email from the ASF dual-hosted git repository.
kenhuuu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit bbe22cf3d936b65d995ac98acbf51d7dfd966db1
Merge: 29e2be5e8f 515ff5baef
Author: Ken Hu <106191785+kenh...@users.noreply.github.com>
AuthorDate: Thu Nov 16 17:12:37 2023 -0800
Merge branch '3.7-dev'
docs/src/dev/provider/gremlin-semantics.asciidoc | 11 ++++++-----
docs/src/reference/the-traversal.asciidoc | 4 ++--
.../process/traversal/step/map/AsStringGlobalStep.java | 5 +++--
.../gremlin/process/traversal/step/map/AsStringLocalStep.java | 4 ++--
.../gremlin/process/traversal/step/map/ConjoinStep.java | 10 +++++++---
.../process/traversal/step/map/AsStringGlobalStepTest.java | 2 +-
.../process/traversal/step/map/AsStringLocalStepTest.java | 2 +-
.../gremlin/process/traversal/step/map/ConjoinStepTest.java | 3 +++
.../tinkerpop/gremlin/test/features/map/AsString.feature | 4 ++--
.../tinkerpop/gremlin/test/features/map/Conjoin.feature | 2 +-
.../tinkerpop/gremlin/test/features/map/ToUpper.feature | 2 +-
11 files changed, 29 insertions(+), 20 deletions(-)
