Skip to content

Commit 2038d0d

Browse files
committed
fix: revert accidental podman driver and mise.lock changes
The cherry-pick conflict resolution for podman container.rs used --theirs which in a cherry-pick context takes the spike's version, not main's. This accidentally included unrelated spike changes (TLS secret prefix removals, SPIFFE mount changes). Revert to upstream/main's version since our PR has no podman changes. Also revert mise.lock changes that were auto-generated when the pre-commit hook installed tools. Signed-off-by: Roland Huß <rhuss@redhat.com>
1 parent 0609a77 commit 2038d0d

2 files changed

Lines changed: 589 additions & 39 deletions

File tree

0 commit comments

Comments
 (0)