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

Revert mis-merged reverts of vendor.conf #442

Merged
merged 1 commit into from
Nov 7, 2017

Conversation

mtrmac
Copy link
Collaborator

@mtrmac mtrmac commented Nov 6, 2017

PR #440 reverted the vendor.conf edits of #426. This passed CI because the corresponding vendor/* subpackages were not modified.

Restore the vendor.conf changes, and re-run full (vndr) to ensure the two are consistent again.

@runcom
Copy link
Member

runcom commented Nov 6, 2017

Thanks a ton Miloslav

@TomSweeneyRedHat
Copy link
Member

LGTM
and happy green lights, looks like this can be merged.

PR containers#440 reverted the vendor.conf edits of containers#426.  This passed CI
because the corresponding vendor/* subpackages were not modified.

Restore the vendor.conf changes, and re-run full (vndr) to ensure
the two are consistent again.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac
Copy link
Collaborator Author

mtrmac commented Nov 7, 2017

@runcom PTAL

@runcom runcom merged commit bb5584b into containers:master Nov 7, 2017
@mtrmac mtrmac deleted the fix-vendor branch November 7, 2017 19:43
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 5, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants