Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backporting changes from multiple PRs from 3.4-22.04/edge branch #120

Merged
merged 5 commits into from
Nov 21, 2024
Merged

Backporting changes from multiple PRs from 3.4-22.04/edge branch #120

merged 5 commits into from
Nov 21, 2024

Conversation

rgildein
Copy link
Contributor

Backporting changes from #114.

@rgildein rgildein self-assigned this Nov 19, 2024
@rgildein rgildein marked this pull request as ready for review November 19, 2024 17:18
@rgildein rgildein requested review from deusebio and welpaolo and removed request for deusebio November 19, 2024 17:18
@rgildein rgildein force-pushed the chore/DPE-5631/backporting branch from 5e61e26 to 58cfe8c Compare November 19, 2024 18:07
@deusebio
Copy link
Contributor

Maybe we could rephrase the name of this PR, as we are backporting a number of commits. We should actually keep on remembering to do this in a structured manner, actually.

Also, I would not squash and merge this PR, but rebase and merge, such that we keep the single backported commits.

@rgildein
Copy link
Contributor Author

Maybe we could rephrase the name of this PR, as we are backporting a number of commits. We should actually keep on remembering to do this in a structured manner, actually.

Yes, I backport all of those commits just to fix trivy. I'll update title and description.

Also, I would not squash and merge this PR, but rebase and merge, such that we keep the single backported commits.

I'm thinking about it, rebase and merge is what I want to do, so we do not lose those commits.

@rgildein rgildein changed the title Add log forwarding Pebble layer to sparkd (#114) Backporting changes from multiple PRs from 3.4-22.04/edge branch Nov 20, 2024
welpaolo
welpaolo approved these changes Nov 20, 2024
View reviewed changes
Copy link
Collaborator

@welpaolo welpaolo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@rgildein rgildein merged commit 39ff7fd into 3.5-22.04/edge Nov 21, 2024
14 checks passed
@rgildein rgildein deleted the chore/DPE-5631/backporting branch November 21, 2024 10:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@welpaolo welpaolo welpaolo approved these changes

@deusebio deusebio Awaiting requested review from deusebio

Assignees

@rgildein rgildein

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rgildein @deusebio @welpaolo