You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tinkerpop.apache.org by ly...@apache.org on 2022/05/31 18:21:25 UTC

[tinkerpop] 01/01: Merge '3.5-dev' into 3.6-dev and solving conflicts

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

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

commit f94e203a7b010052373446be7c247b678f317de0
Merge: b663e04c8a 5fb7888f4e
Author: Lyndon Bauto <ly...@bitquilltech.com>
AuthorDate: Tue May 31 11:21:12 2022 -0700

    Merge '3.5-dev' into 3.6-dev and solving conflicts

 .github/workflows/build-test.yml                   |  5 +-
 .gitignore                                         |  1 +
 CHANGELOG.asciidoc                                 |  1 +
 .../process/traversal/step/map/RangeLocalStep.java |  9 ++++
 gremlin-go/Dockerfile                              | 18 ++-----
 gremlin-go/README.md                               | 25 +++++++--
 gremlin-go/docker-compose.yml                      | 15 +++---
 gremlin-go/docker/docker-entrypoint.sh             |  2 +
 .../docker/gremlin-server-integration-secure.yaml  |  1 +
 gremlin-go/docker/gremlin-server-integration.yaml  |  1 +
 gremlin-go/run.sh                                  | 50 ++++++++++++++++++
 gremlin-go/wait-for-server.sh                      | 60 ++++++++++++++++++++++
 12 files changed, 162 insertions(+), 26 deletions(-)