Skip to content

[release/1.7 backport] Fix panic when remote differ returns empty result#8631

Merged
kzys merged 1 commit intocontainerd:release/1.7from
thaJeztah:1.7_backport_fix_diff_proxy
Jun 2, 2023
Merged

[release/1.7 backport] Fix panic when remote differ returns empty result#8631
kzys merged 1 commit intocontainerd:release/1.7from
thaJeztah:1.7_backport_fix_diff_proxy

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

⚠️ I had to adjust the patch because 3784c1c (#8399) is not in the 1.7 branch, and moved this function from diff.go to proxy/diff.go

^^ I also don't know if that means that this patch is not needed without the other PR in this branch (/cc @dmcgowan)

(cherry picked from commit 0d97523)

Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit 0d97523)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Copy Markdown
Member Author

remind me that I didn't check if the 1.6 LTS branch needs this (sorry, got pulled into various calls)

@kzys kzys merged commit 0aa82d1 into containerd:release/1.7 Jun 2, 2023
@thaJeztah thaJeztah deleted the 1.7_backport_fix_diff_proxy branch June 2, 2023 18:22
@thaJeztah thaJeztah changed the title [1.7 backport] Fix panic when remote differ returns empty result [release/1.7 backport] Fix panic when remote differ returns empty result Jun 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants