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

Vendor in latest containers/common #17014

Merged
merged 1 commit into from
Jan 9, 2023

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Jan 5, 2023

Signed-off-by: Daniel J Walsh [email protected]

Does this PR introduce a user-facing change?

Network Lock file moved from network config directories to /run directory.

@openshift-ci openshift-ci bot added do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None approved Indicates a PR has been approved by an approver from all required OWNERS files. release-note and removed do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None labels Jan 5, 2023
Comment on lines -52 to -58
// check that the only file in the directory is the network lockfile
dir, err := os.Open(netDir)
Expect(err).ToNot(HaveOccurred())
names, err := dir.Readdirnames(5)
Expect(err).ToNot(HaveOccurred())
Expect(names).To(HaveLen(1))
Expect(names[0]).To(Or(Equal("netavark.lock"), Equal("cni.lock")))
Copy link
Member

Choose a reason for hiding this comment

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

keep the test, just remove that part here since it is no longer applicable

@rhatdan
Copy link
Member Author

rhatdan commented Jan 8, 2023

@Luap99 @vrothberg @giuseppe @flouthoc PTAL
@containers/podman-maintainers PTAL

@umohnani8
Copy link
Member

LGTM

Copy link
Collaborator

@flouthoc flouthoc left a comment

Choose a reason for hiding this comment

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

LGTM
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 9, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 9, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, rhatdan

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-merge-robot openshift-merge-robot merged commit bc6908e into containers:main Jan 9, 2023
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 16, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 16, 2023
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. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants