Skip to content

Commit 51794a2

Browse files
authored
Merge branch 'aws:1.5' into 1.5
2 parents e7d1380 + 34728b6 commit 51794a2

File tree

4 files changed

+41
-6
lines changed

4 files changed

+41
-6
lines changed

patched-vscode/build/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2567,9 +2567,9 @@ supports-color@^7.1.0:
25672567
has-flag "^4.0.0"
25682568

25692569
tar-fs@^2.0.0:
2570-
version "2.1.1"
2571-
resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
2572-
integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
2570+
version "2.1.2"
2571+
resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.2.tgz#425f154f3404cb16cb8ff6e671d45ab2ed9596c5"
2572+
integrity sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==
25732573
dependencies:
25742574
chownr "^1.1.1"
25752575
mkdirp-classic "^0.5.2"

patched-vscode/remote/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -587,9 +587,9 @@ strip-json-comments@~2.0.1:
587587
integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
588588

589589
tar-fs@^2.0.0:
590-
version "2.1.1"
591-
resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
592-
integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
590+
version "2.1.2"
591+
resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.2.tgz#425f154f3404cb16cb8ff6e671d45ab2ed9596c5"
592+
integrity sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==
593593
dependencies:
594594
chownr "^1.1.1"
595595
mkdirp-classic "^0.5.2"

patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
tar-fs-upgrade.patch
12
sagemaker-extension.diff
23
disable-online-services.diff
34
disable-telemetry.diff

patches/tar-fs-upgrade.patch

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
Index: sagemaker-code-editor/vscode/build/yarn.lock
2+
===================================================================
3+
--- sagemaker-code-editor.orig/vscode/build/yarn.lock
4+
+++ sagemaker-code-editor/vscode/build/yarn.lock
5+
@@ -2567,9 +2567,9 @@ supports-color@^7.1.0:
6+
has-flag "^4.0.0"
7+
8+
tar-fs@^2.0.0:
9+
- version "2.1.1"
10+
- resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
11+
- integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
12+
+ version "2.1.2"
13+
+ resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.2.tgz#425f154f3404cb16cb8ff6e671d45ab2ed9596c5"
14+
+ integrity sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==
15+
dependencies:
16+
chownr "^1.1.1"
17+
mkdirp-classic "^0.5.2"
18+
Index: sagemaker-code-editor/vscode/remote/yarn.lock
19+
===================================================================
20+
--- sagemaker-code-editor.orig/vscode/remote/yarn.lock
21+
+++ sagemaker-code-editor/vscode/remote/yarn.lock
22+
@@ -587,9 +587,9 @@ strip-json-comments@~2.0.1:
23+
integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
24+
25+
tar-fs@^2.0.0:
26+
- version "2.1.1"
27+
- resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
28+
- integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
29+
+ version "2.1.2"
30+
+ resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.2.tgz#425f154f3404cb16cb8ff6e671d45ab2ed9596c5"
31+
+ integrity sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==
32+
dependencies:
33+
chownr "^1.1.1"
34+
mkdirp-classic "^0.5.2"

0 commit comments

Comments
 (0)