Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

50 changes: 0 additions & 50 deletions bigtop-packages/src/common/hadoop/patch1-HADOOP-19116-3.3.6.diff

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
commit 85a5bef06a23c8c2c7aa03834eacd952865b342a
Author: slfan1989 <[email protected]>
Date: Wed Oct 8 09:46:41 2025 +0800

YARN-11875. Fix build failure caused by [email protected]. (#8016) Contributed by Shilun Fan

* YARN-11875. Fix build failure caused by [email protected].

Reviewed-by: Steve Loughran <[email protected]>
Signed-off-by: Shilun Fan <[email protected]>
(cherry picked from commit d9c33088628d7146664ba97e4ef5f196b5f12d15)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
index f09442cfc4e87..59cc3da179fd0 100644
index 59cc3da179f..f5dd22bffcb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
@@ -19,6 +19,9 @@
"shelljs": "^0.2.6",
@@ -20,6 +20,7 @@
"apidoc": "0.17.7"
},
+ "resolutions": {
+ "triple-beam": "1.3.0"
+ },
"resolutions": {
+ "color": "3.1.3",
"triple-beam": "1.3.0"
},
"scripts": {
"prestart": "npm install & mvn clean package",
"pretest": "npm install"

This file was deleted.

115 changes: 0 additions & 115 deletions bigtop-packages/src/common/hadoop/patch2-HADOOP-18583.diff

This file was deleted.

Loading