Skip to content

Commit 4e89f4b

Browse files
committed
Merge branches 'w/8.5/improvement/CLDSRV-234-bump-arsenal' and 'q/4630/8.4/improvement/CLDSRV-234-bump-arsenal' into tmp/octopus/q/8.5
3 parents 4fa5bf7 + 5effe07 + fc5bde5 commit 4e89f4b

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

eve/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ models:
9494
name: install modules
9595
command: yarn install --ignore-engines --frozen-lockfile --network-concurrency=1
9696
haltOnFailure: true
97+
env:
98+
NODE_OPTIONS: --max-old-space-size=8192
9799
- ShellCommand: &check-s3-action-logs
98100
name: Check s3 action logs
99101
command: |

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"homepage": "https://github.com/scality/S3#readme",
2121
"dependencies": {
2222
"@hapi/joi": "^17.1.0",
23-
"arsenal": "git+https://github.com/scality/Arsenal#8.1.58",
23+
"arsenal": "git+https://github.com/scality/Arsenal.git#8.1.59",
2424
"async": "~2.5.0",
2525
"aws-sdk": "2.905.0",
2626
"azure-storage": "^2.1.0",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -510,17 +510,17 @@ arraybuffer.slice@~0.0.7:
510510
optionalDependencies:
511511
ioctl "^2.0.2"
512512

513-
"arsenal@git+https://github.com/scality/Arsenal#8.1.58":
514-
version "8.1.58"
515-
resolved "git+https://github.com/scality/Arsenal#56665069c1746fa385410f572d768255593781b5"
513+
"arsenal@git+https://github.com/scality/Arsenal.git#8.1.59":
514+
version "8.1.59"
515+
resolved "git+https://github.com/scality/Arsenal.git#56c1ba5c215630ad2ea7d542b9ff0c7032843ee0"
516516
dependencies:
517517
"@types/async" "^3.2.12"
518518
"@types/utf8" "^3.0.1"
519519
JSONStream "^1.0.0"
520520
agentkeepalive "^4.1.3"
521521
ajv "6.12.3"
522522
async "~2.6.4"
523-
aws-sdk "2.80.0"
523+
aws-sdk "^2.1005.0"
524524
azure-storage "~2.10.7"
525525
backo "^1.1.0"
526526
base-x "3.0.8"

0 commit comments

Comments
 (0)