You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ke...@apache.org on 2023/04/25 05:00:22 UTC

[tinkerpop] branch master updated (154a357bc5 -> a506c3848b)

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

kenhuuu pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


    from 154a357bc5 Merge branch '3.6-dev'
     add 13ec3c9f09 Bump grunt in /gremlin-javascript/src/main/javascript/gremlin-javascript
     add 9882982e2d Merge pull request #1957
     add 5400324bb6 Bump ws in /gremlin-javascript/src/main/javascript/gremlin-javascript
     add 784dff43ca Merge pull request #1988
     add 7d0f6267bc Bump eslint-config-prettier
     add 5874a9bcd7 Merge pull request #1997
     add 86bfa41535 Bump golang.org/x/text from 0.6.0 to 0.9.0 in /gremlin-go
     add 7faae18636 Merge pull request #2013
     add 90a63e9f28 Merge branch '3.5-dev' into 3.6-dev
     add e486336143 Remove unnecessary JS dependencies that were added during merge CTR.
     new a506c3848b 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:
 gremlin-go/go.mod                                  |   2 +-
 gremlin-go/go.sum                                  |  11 +-
 .../gremlin-javascript/package-lock.json           | 145 +++++++++------------
 3 files changed, 68 insertions(+), 90 deletions(-)


[tinkerpop] 01/01: Merge branch '3.6-dev'

Posted by ke...@apache.org.
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 a506c3848b4337b47d34124efb8b0517ebf2372c
Merge: 154a357bc5 e486336143
Author: Ken Hu <10...@users.noreply.github.com>
AuthorDate: Mon Apr 24 21:59:14 2023 -0700

    Merge branch '3.6-dev'

 gremlin-go/go.mod                                  |   2 +-
 gremlin-go/go.sum                                  |  11 +-
 .../gremlin-javascript/package-lock.json           | 145 +++++++++------------
 3 files changed, 68 insertions(+), 90 deletions(-)

diff --cc gremlin-go/go.mod
index 6da18d488c,fc76152e81..0ec0458ca9
--- a/gremlin-go/go.mod
+++ b/gremlin-go/go.mod
@@@ -25,8 -25,7 +25,8 @@@ require 
  	github.com/gorilla/websocket v1.5.0
  	github.com/nicksnyder/go-i18n/v2 v2.2.1
  	github.com/stretchr/testify v1.8.1
- 	golang.org/x/text v0.6.0
+ 	golang.org/x/text v0.9.0
 +	gopkg.in/yaml.v3 v3.0.1
  )
  
  require (