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/06/06 22:28:37 UTC
[tinkerpop] branch master updated (42cefe106a -> 310e9f8993)
This is an automated email from the ASF dual-hosted git repository.
lyndonb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 42cefe106a Merge branch '3.6-dev'
add fbca24b81b Hadoop Gremlin Windows Build Fixes (#120) (#1679)
add 8dba41c10a TINKERPOP-2749: Gremlin Javascript, Gremlint Windows build error fixes (#1671)
add bf9056564f Resolving 3.5-dev -> 3.6-dev merge conflicts.
new 310e9f8993 Merge branch '3.6-dev'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/build-test.yml | 5 ++-
.../dev/developer/development-environment.asciidoc | 6 ++-
gremlin-javascript/pom.xml | 7 ++--
.../javascript/gremlin-javascript/.eslintrc.js | 4 +-
.../gremlin-javascript/package-lock.json | 28 +++++++++++++
.../javascript/gremlin-javascript/package.json | 11 ++---
.../src/test/scripts/test-server-start.groovy | 49 ++++++++++++----------
gremlint/pom.xml | 3 +-
8 files changed, 79 insertions(+), 34 deletions(-)
[tinkerpop] 01/01: Merge branch '3.6-dev'
Posted by ly...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lyndonb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 310e9f8993538ef80401e55d23a8b7280cfc1f4b
Merge: 42cefe106a bf9056564f
Author: Lyndon Bauto <ly...@bitquilltech.com>
AuthorDate: Mon Jun 6 15:28:21 2022 -0700
Merge branch '3.6-dev'
.github/workflows/build-test.yml | 5 ++-
.../dev/developer/development-environment.asciidoc | 6 ++-
gremlin-javascript/pom.xml | 7 ++--
.../javascript/gremlin-javascript/.eslintrc.js | 4 +-
.../gremlin-javascript/package-lock.json | 28 +++++++++++++
.../javascript/gremlin-javascript/package.json | 11 ++---
.../src/test/scripts/test-server-start.groovy | 49 ++++++++++++----------
gremlint/pom.xml | 3 +-
8 files changed, 79 insertions(+), 34 deletions(-)