Skip to content

update to github.com/sirupsen/logrus v1.0.0#1136

Closed
mcandre wants to merge 1 commit intocontainerd:masterfrom
mcandre:update-logrus
Closed

update to github.com/sirupsen/logrus v1.0.0#1136
mcandre wants to merge 1 commit intocontainerd:masterfrom
mcandre:update-logrus

Conversation

@mcandre
Copy link

@mcandre mcandre commented Jul 6, 2017

Signed-off-by: Andrew Pennebaker apennebaker@datapipe.com

Fix some dependencies by updating casing to github.com/sirupsen/logrus (The project has moved.)

go test still fails with plugin/context.go:8:2: case-insensitive import collision. Likely need to fix the logrus casing in containerd's dependencies' code as well.

Signed-off-by: Andrew Pennebaker <apennebaker@datapipe.com>
@codecov-io
Copy link

Codecov Report

Merging #1136 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1136   +/-   ##
=======================================
  Coverage   31.69%   31.69%           
=======================================
  Files          27       27           
  Lines        2174     2174           
=======================================
  Hits          689      689           
  Misses       1337     1337           
  Partials      148      148
Impacted Files Coverage Δ
fs/diff.go 46.47% <ø> (ø) ⬆️
snapshot/btrfs/btrfs.go 53.17% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e283b38...46a4e6f. Read the comment docs.

@crosbymichael
Copy link
Member

LGTM

Thanks @mcandre

@dmcgowan
Copy link
Member

dmcgowan commented Jul 6, 2017

LGTM

@dmcgowan
Copy link
Member

dmcgowan commented Jul 6, 2017

Does continuity need to be merged first?

@estesp
Copy link
Member

estesp commented Jul 6, 2017

Given we did this before (#415) and then reverted (#448) when the downstream dependency chain became too complicated.. can we verify that all downstream imports are fixed before merging?

@mlaventure
Copy link
Contributor

Are we certain the decision is not going to be reverted again?

@crosbymichael
Copy link
Member

Right now runc is failing with this change so we can hold off until that downstream is resolved.

@stevvooe
Copy link
Member

@mlaventure Roll forward, not back!

@dmcgowan
Copy link
Member

Can you please update this, some of the downstreams have merged their changes

@dmcgowan
Copy link
Member

Carrying in #1234

@dmcgowan dmcgowan closed this Jul 21, 2017
stevvooe added a commit that referenced this pull request Jul 21, 2017
update to github.com/sirupsen/logrus v1.0.0 [carry #1136]
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.

7 participants