-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update patches, checksums and attribution for replicatedhq/troubleshoot
- Loading branch information
1 parent
5ceea31
commit 69bc57d
Showing
3 changed files
with
23 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
8d15a869d71606985ff38d06ef44dd945f301b85a5e6849369ca7bb9c873ad9e _output/bin/troubleshoot/linux-amd64/support-bundle | ||
c189e9b48d525259f19f79c05427ea0c97b8e1d4d78b0a995d490d4f1038b87f _output/bin/troubleshoot/linux-arm64/support-bundle | ||
323cc813beb9ae65a6ee016e9b7ab0918679eb99a408ec5cc6f65012added6aa _output/bin/troubleshoot/linux-amd64/support-bundle | ||
dcc04d5f6dd0baf3b875e39e8d244bf7a5e0c998c49889636ce2da234e9a696c _output/bin/troubleshoot/linux-arm64/support-bundle |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 3cd425d8b5e5f7a19c6683641760680cbaba5b16 Mon Sep 17 00:00:00 2001 | ||
From 3421d32b915c8929bddd0fe3720dfcb11539d985 Mon Sep 17 00:00:00 2001 | ||
From: danbudris <[email protected]> | ||
Date: Fri, 3 Mar 2023 15:07:50 -0800 | ||
Subject: [PATCH] Replace dependency to mitigate license issues and fix module | ||
|
@@ -18,7 +18,7 @@ Signed-off-by: Dan Budris <[email protected]> | |
2 files changed, 7 insertions(+), 3 deletions(-) | ||
|
||
diff --git a/go.mod b/go.mod | ||
index 6194d96..a3f6ddd 100644 | ||
index 2109e4a..e73f833 100644 | ||
--- a/go.mod | ||
+++ b/go.mod | ||
@@ -116,6 +116,7 @@ require ( | ||
|
@@ -27,8 +27,8 @@ index 6194d96..a3f6ddd 100644 | |
github.com/xeipuuv/gojsonschema v1.2.0 // indirect | ||
+ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect | ||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect | ||
go.opentelemetry.io/otel/metric v1.24.0 // indirect | ||
go.opentelemetry.io/otel/trace v1.24.0 // indirect | ||
go.opentelemetry.io/otel/metric v1.25.0 // indirect | ||
go.opentelemetry.io/otel/trace v1.25.0 // indirect | ||
@@ -136,7 +137,7 @@ require ( | ||
github.com/BurntSushi/toml v1.3.2 // indirect | ||
github.com/Microsoft/go-winio v0.6.1 // indirect | ||
|
@@ -46,14 +46,14 @@ index 6194d96..a3f6ddd 100644 | |
github.com/xlab/treeprint v1.2.0 // indirect | ||
github.com/yusufpapurcu/wmi v1.2.4 // indirect | ||
go.opencensus.io v0.24.0 // indirect | ||
@@ -265,4 +265,5 @@ require ( | ||
@@ -266,4 +266,5 @@ require ( | ||
replace ( | ||
github.com/StackExchange/wmi => github.com/yusufpapurcu/wmi v1.2.2 | ||
github.com/go-ole/go-ole => github.com/go-ole/go-ole v1.2.6 // needed for arm builds | ||
+ github.com/xi2/xz => github.com/therootcompany/xz v1.0.1 | ||
) | ||
diff --git a/go.sum b/go.sum | ||
index 6fc4b39..5027b70 100644 | ||
index 925e6d2..06787c4 100644 | ||
--- a/go.sum | ||
+++ b/go.sum | ||
@@ -234,8 +234,9 @@ github.com/ahmetalpbalkan/go-cursor v0.0.0-20131010032410-8136607ea412 h1:vOVO0y | ||
|