Skip to content

Conversation

@wking
Copy link
Contributor

@wking wking commented May 11, 2018

Neither the nominal version nor vendored content had changed since a031b83 (Initial checkin from CRI-O repo, 2017-11-01):

$ git ls-tree origin/master -- vendor/github.com/containernetworking/cni
040000 tree 744c091cc1dbb869b2cf714cf6b5e8d33fe17d9c    vendor/github.com/containernetworking/cni
$ git ls-tree a031b83a -- vendor/github.com/containernetworking/cni
040000 tree 744c091cc1dbb869b2cf714cf6b5e8d33fe17d9c    vendor/github.com/containernetworking/cni
$ git grep /cni a031b83a -- vendor.conf
a031b83a:vendor.conf:github.com/containernetworking/cni v0.4.0

I'm not quite sure which upstream version the old vendored content came from, but it certainly wasn't v0.4.0.  I've bumped our nominal version to v0.6.0 and re-vendored with:

```console
$ vndr github.com/containernetworking/cni
$ git add -A vendor/github.com/containernetworking/cni

to generate this commit. The only change to the vendored content is text in the README (unlikely to break anything ;), and sitting on an upstream tag is nice, so I think this is good enough.

Spun off from #747.

Neither the nominal version nor vendored content had changed since
a031b83 (Initial checkin from CRI-O repo, 2017-11-01):

  $ git ls-tree origin/master -- vendor/github.com/containernetworking/cni
  040000 tree 744c091    vendor/github.com/containernetworking/cni
  $ git ls-tree a031b83 -- vendor/github.com/containernetworking/cni
  040000 tree 744c091    vendor/github.com/containernetworking/cni
  $ git grep /cni a031b83 -- vendor.conf
  a031b83:vendor.conf:github.com/containernetworking/cni v0.4.0

I'm not quite sure which upstream version the old vendored content
came from, but it certainly wasn't v0.4.0.  I've bumped our nominal
version to v0.6.0 and re-vendored with:

  $ vndr github.com/containernetworking/cni
  $ git add -A vendor/github.com/containernetworking/cni

to generate this commit.  The only change to the vendored content is
text in the README (unlikely to break anything ;), and sitting on an
upstream tag is nice, so I think this is good enough.

Signed-off-by: W. Trevor King <[email protected]>
@wking wking force-pushed the vendor-cni-cleanup branch from 623e8c7 to 1837e3b Compare May 11, 2018 04:33
@giuseppe
Copy link
Member

LGTM

@mheon
Copy link
Member

mheon commented May 11, 2018

LGTM
@rh-atomic-bot r+

@rh-atomic-bot
Copy link
Collaborator

📌 Commit 1837e3b has been approved by mheon

@rh-atomic-bot
Copy link
Collaborator

⚡ Test exempted: pull fully rebased and already tested.

@wking wking deleted the vendor-cni-cleanup branch May 11, 2018 16:06
@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 27, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants