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.

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

Fix a compilation error in pkg/machine/config.go #21621

Closed
wants to merge 1 commit into from

Conversation

mtrmac
Copy link
Collaborator

@mtrmac mtrmac commented Feb 12, 2024

Commit c524da2 has merged the outcome of two individually tested PRs, resulting in a semantic conflict.

[EDIT: that was #21573]

Does this PR introduce a user-facing change?

None

Copy link
Contributor

openshift-ci bot commented Feb 12, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mtrmac

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 12, 2024
@mheon
Copy link
Member

mheon commented Feb 12, 2024

LGTM

1 similar comment
@edsantiago
Copy link
Member

LGTM

@baude
Copy link
Member

baude commented Feb 12, 2024

/hold
/lgtm

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 12, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 12, 2024
Commit c524da2 has merged
the outcome of two individually tested PRs, resulting in
a semantic conflict.

[NO NEW TESTS NEEDED]

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac mtrmac force-pushed the fix-compilation-breakage branch from f0ba6bb to 2102a9c Compare February 12, 2024 19:19
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 12, 2024
Copy link
Contributor

openshift-ci bot commented Feb 12, 2024

New changes are detected. LGTM label has been removed.

@mtrmac
Copy link
Collaborator Author

mtrmac commented Feb 12, 2024

The change is to add [NO NEW TESTS NEEDED].

https://github.com/containers/podman/pull/21621/checks?check_run_id=21490899704 fails, though, building the HEAD commit. It might be safest to just ignore that failure, rather than disable the check and then risk forgetting to reenable…

@mheon
Copy link
Member

mheon commented Feb 12, 2024

Force-pushed to fix main. Closing as this is no longer necessary.

@mtrmac mtrmac closed this Feb 12, 2024
@mtrmac mtrmac deleted the fix-compilation-breakage branch February 12, 2024 19:49
@stale-locking-app stale-locking-app bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label May 13, 2024
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators May 13, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. machine release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants