Skip to content

Commit 8b604b9

Browse files
Merge remote-tracking branch 'origin/w/8.8/bugfix/CLDSRV-645-crashWhenPuttingReplicationConfiguration' into w/9.0/bugfix/CLDSRV-645-crashWhenPuttingReplicationConfiguration
2 parents 9dfc662 + 26ad86c commit 8b604b9

File tree

2 files changed

+62
-12
lines changed

2 files changed

+62
-12
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"dependencies": {
2222
"@azure/storage-blob": "^12.25.0",
2323
"@hapi/joi": "^17.1.1",
24-
"arsenal": "git+https://github.com/scality/arsenal#8.2.12",
24+
"arsenal": "git+https://github.com/scality/arsenal#8.2.14",
2525
"async": "2.6.4",
2626
"aws-sdk": "^2.1692.0",
2727
"bucketclient": "scality/bucketclient#8.2.3",

yarn.lock

Lines changed: 61 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,23 @@
193193
stoppable "^1.1.0"
194194
tslib "^2.2.0"
195195

196+
"@azure/identity@^4.9.1":
197+
version "4.9.1"
198+
resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-4.9.1.tgz#ee4b9435f1b96bea5985e7dec989760a67d9a119"
199+
integrity sha512-986D7Cf1AOwYqSDtO/FnMAyk/Jc8qpftkGsxuehoh4F85MhQ4fICBGX/44+X1y78lN4Sqib3Bsoaoh/FvOGgmg==
200+
dependencies:
201+
"@azure/abort-controller" "^2.0.0"
202+
"@azure/core-auth" "^1.9.0"
203+
"@azure/core-client" "^1.9.2"
204+
"@azure/core-rest-pipeline" "^1.17.0"
205+
"@azure/core-tracing" "^1.0.0"
206+
"@azure/core-util" "^1.11.0"
207+
"@azure/logger" "^1.0.0"
208+
"@azure/msal-browser" "^4.2.0"
209+
"@azure/msal-node" "^3.5.0"
210+
open "^10.1.0"
211+
tslib "^2.2.0"
212+
196213
"@azure/logger@^1.0.0":
197214
version "1.1.4"
198215
resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.1.4.tgz#223cbf2b424dfa66478ce9a4f575f59c6f379768"
@@ -212,6 +229,11 @@
212229
resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-15.3.0.tgz#cc75760f7929588b261b970a1dd1d292d0efdbc8"
213230
integrity sha512-lh+eZfibGwtQxFnx+mj6cYWn0pwA8tDnn8CBs9P21nC7Uw5YWRwfXaXdVQSMENZ5ojRqR+NzRaucEo4qUvs3pA==
214231

232+
"@azure/msal-common@15.6.0":
233+
version "15.6.0"
234+
resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-15.6.0.tgz#0764d6446eeff3970221995e25f265fdb218da66"
235+
integrity sha512-EotmBz42apYGjqiIV9rDUdptaMptpTn4TdGf3JfjLvFvinSe9BJ6ywU92K9ky+t/b0ghbeTSe9RfqlgLh8f2jA==
236+
215237
"@azure/msal-node@^3.2.3":
216238
version "3.4.0"
217239
resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-3.4.0.tgz#d94e8d5bf9563e2e730bde566e597834c19a0eb0"
@@ -221,6 +243,15 @@
221243
jsonwebtoken "^9.0.0"
222244
uuid "^8.3.0"
223245

246+
"@azure/msal-node@^3.5.0":
247+
version "3.5.3"
248+
resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-3.5.3.tgz#02f7a2344a2c2994354a0cec125b9ef9a8e7109b"
249+
integrity sha512-c5mifzHX5mwm5JqMIlURUyp6LEEdKF1a8lmcNRLBo0lD7zpSYPHupa4jHyhJyg9ccLwszLguZJdk2h3ngnXwNw==
250+
dependencies:
251+
"@azure/msal-common" "15.6.0"
252+
jsonwebtoken "^9.0.0"
253+
uuid "^8.3.0"
254+
224255
"@azure/storage-blob@^12.25.0":
225256
version "12.27.0"
226257
resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.27.0.tgz#3062930411173a28468bd380e0ad2c6328d7288a"
@@ -1443,17 +1474,14 @@ arraybuffer.prototype.slice@^1.0.4:
14431474
optionalDependencies:
14441475
ioctl "^2.0.2"
14451476

1446-
"arsenal@git+https://github.com/scality/arsenal#8.2.12":
1447-
version "8.2.12"
1448-
resolved "git+https://github.com/scality/arsenal#ff9a17a53e73579ea27c039584ba00bf18e5c135"
1477+
"arsenal@git+https://github.com/scality/arsenal#8.2.14":
1478+
version "8.2.14"
1479+
resolved "git+https://github.com/scality/arsenal#7e858dd42dbbdf05f8281b278105969e1e3ef54e"
14491480
dependencies:
1450-
"@azure/identity" "^4.5.0"
1481+
"@azure/identity" "^4.9.1"
14511482
"@azure/storage-blob" "^12.25.0"
1452-
"@eslint/plugin-kit" "^0.2.7"
14531483
"@js-sdsl/ordered-set" "^4.4.2"
14541484
"@scality/hdclient" "^1.3.1"
1455-
"@types/async" "^3.2.24"
1456-
"@types/utf8" "^3.0.3"
14571485
JSONStream "^1.3.5"
14581486
agentkeepalive "^4.6.0"
14591487
ajv "6.12.3"
@@ -1462,18 +1490,16 @@ arraybuffer.prototype.slice@^1.0.4:
14621490
backo "^1.1.0"
14631491
base-x "3.0.8"
14641492
base62 "^2.0.2"
1465-
bson "^6.8.0"
14661493
debug "^4.3.7"
1467-
diskusage "^1.2.0"
14681494
fcntl "github:scality/node-fcntl#0.3.0"
14691495
httpagent scality/httpagent#1.1.0
14701496
https-proxy-agent "^7.0.6"
1471-
ioredis "^5.4.1"
1497+
ioredis "^5.6.1"
14721498
ipaddr.js "^2.2.0"
14731499
joi "^17.13.3"
14741500
level "~5.0.1"
14751501
level-sublevel "~6.6.5"
1476-
mongodb "^6.11.0"
1502+
mongodb "^6.15.0"
14771503
node-forge "^1.3.1"
14781504
prom-client "^15.1.3"
14791505
simple-glob "^0.2.0"
@@ -3762,6 +3788,21 @@ ioredis@^5.4.1, ioredis@^5.4.2:
37623788
redis-parser "^3.0.0"
37633789
standard-as-callback "^2.1.0"
37643790

3791+
ioredis@^5.6.1:
3792+
version "5.6.1"
3793+
resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.6.1.tgz#1ed7dc9131081e77342503425afceaf7357ae599"
3794+
integrity sha512-UxC0Yv1Y4WRJiGQxQkP0hfdL0/5/6YvdfOOClRgJ0qppSarkhneSa6UvkMkms0AkdGimSH3Ikqm+6mkMmX7vGA==
3795+
dependencies:
3796+
"@ioredis/commands" "^1.1.1"
3797+
cluster-key-slot "^1.1.0"
3798+
debug "^4.3.4"
3799+
denque "^2.1.0"
3800+
lodash.defaults "^4.2.0"
3801+
lodash.isarguments "^3.1.0"
3802+
redis-errors "^1.2.0"
3803+
redis-parser "^3.0.0"
3804+
standard-as-callback "^2.1.0"
3805+
37653806
ip-address@^9.0.5:
37663807
version "9.0.5"
37673808
resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a"
@@ -5176,6 +5217,15 @@ mongodb@^6.11.0:
51765217
bson "^6.10.3"
51775218
mongodb-connection-string-url "^3.0.0"
51785219

5220+
mongodb@^6.15.0:
5221+
version "6.16.0"
5222+
resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-6.16.0.tgz#2a7a1986ec151d9c738fc8ce4cf4324c3f728a2f"
5223+
integrity sha512-D1PNcdT0y4Grhou5Zi/qgipZOYeWrhLEpk33n3nm6LGtz61jvO88WlrWCK/bigMjpnOdAUKKQwsGIl0NtWMyYw==
5224+
dependencies:
5225+
"@mongodb-js/saslprep" "^1.1.9"
5226+
bson "^6.10.3"
5227+
mongodb-connection-string-url "^3.0.0"
5228+
51795229
ms@2.0.0:
51805230
version "2.0.0"
51815231
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"

0 commit comments

Comments
 (0)