Skip to content

[release-1.19] [cri-o config] fix drop-in config directory used for config overrides#1830

Merged
cdesiniotis merged 2 commits into
release-1.19from
backport-1829-to-release-1.19
May 15, 2026
Merged

[release-1.19] [cri-o config] fix drop-in config directory used for config overrides#1830
cdesiniotis merged 2 commits into
release-1.19from
backport-1829-to-release-1.19

Conversation

@github-actions
Copy link
Copy Markdown

🤖 Automated backport of #1829 to release-1.19

✅ Cherry-pick completed successfully with no conflicts.

Original PR: #1829
Original Author: @tariq1890

Cherry-picked commits (1):

  • 584f68e [cri-o config] fix drop-in config directory used for config overrides

This backport was automatically created by the backport bot.

Signed-off-by: Tariq Ibrahim <tibrahim@nvidia.com>
(cherry picked from commit 584f68e)
@copy-pr-bot
Copy link
Copy Markdown

copy-pr-bot Bot commented May 15, 2026

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

Signed-off-by: Christopher Desiniotis <cdesiniotis@nvidia.com>
@cdesiniotis cdesiniotis enabled auto-merge May 15, 2026 15:27
@coveralls
Copy link
Copy Markdown

coveralls commented May 15, 2026

Coverage Report for CI Build 25930614711

Coverage remained the same at 43.341%

Details

  • Coverage remained the same as the base build.
  • Patch coverage: No coverable lines changed in this PR.
  • No coverage regressions found.

Uncovered Changes

No uncovered changes found.

Coverage Regressions

No coverage regressions found.


Coverage Stats

Coverage Status
Relevant Lines: 14866
Covered Lines: 6443
Line Coverage: 43.34%
Coverage Strength: 0.48 hits per line

💛 - Coveralls

@tariq1890
Copy link
Copy Markdown
Contributor

@cdesiniotis is the change log update not needed in main ?

@cdesiniotis
Copy link
Copy Markdown
Contributor

@cdesiniotis is the change log update not needed in main ?

No. I have noticed in the past, the changelog on main and release branches have diverged. E.g. for 1.19.1 (or any other patch release) the changelog is exclusively maintained on the release branch, and not on main.

@tariq1890
Copy link
Copy Markdown
Contributor

/ok to test acbd472

@cdesiniotis cdesiniotis merged commit f982ac5 into release-1.19 May 15, 2026
20 checks passed
@cdesiniotis cdesiniotis deleted the backport-1829-to-release-1.19 branch May 15, 2026 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants