Skip to content

Fix vendored dependencies#2908

Merged
kolyshkin merged 1 commit into
opencontainers:masterfrom
saschagrunert:vendor
Apr 14, 2021
Merged

Fix vendored dependencies#2908
kolyshkin merged 1 commit into
opencontainers:masterfrom
saschagrunert:vendor

Conversation

@saschagrunert
Copy link
Copy Markdown
Contributor

The current master branch does not build, running a make vendor fixes
this inconsistency.

The current master branch does not build, running a `make vendor` fixes
this inconsistency.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
@mrunalp
Copy link
Copy Markdown
Contributor

mrunalp commented Apr 14, 2021

@kolyshkin @AkihiroSuda @cyphar ptal

@kolyshkin
Copy link
Copy Markdown
Contributor

Probably caused by a mixup between #2904 and #2903 (#2904 needed to be rebased after #2903 was merged and I missed that).

Copy link
Copy Markdown
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

LGTM

@kolyshkin kolyshkin merged commit 3397a09 into opencontainers:master Apr 14, 2021
@saschagrunert saschagrunert deleted the vendor branch April 14, 2021 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants