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/07/01 15:25:14 UTC
[tinkerpop] 02/03: Merge branch '3.4-dev' into 3.5-dev
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 8b5d7b3022b0b58f2d1f53951b31ba87b5ca1cb4
Merge: dd35329 b7cb0e1
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Jul 1 11:01:47 2021 -0400
Merge branch '3.4-dev' into 3.5-dev
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.4.x.asciidoc | 7 +++++++
.../src/main/javascript/gremlin-javascript/package-lock.json | 8 ++++----
.../src/main/javascript/gremlin-javascript/package.json | 2 +-
4 files changed, 13 insertions(+), 5 deletions(-)
diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
index 35baa25,fc9e9e3..896bf5d
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
@@@ -120,9 -3483,7 +120,9 @@@
"dev": true
},
"async-limiter": {
- "version": "1.0.1"
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
- "integrity": "sha1-3TeelPDbgxCwgpH51kwyCXZmF/0="
++ "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
},
"atob": {
"version": "2.1.2",
@@@ -2599,9 -5813,7 +2599,9 @@@
"dev": true
},
"ws": {
-- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
- "integrity": "sha1-RC/fCkftZPWbal2P8TD0dI7VJPs=",
++ "version": "6.2.2",
++ "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
++ "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
"requires": {
"async-limiter": "~1.0.0"
}