Skip to content

Updated logrus to v1#1526

Merged
crosbymichael merged 1 commit intoopencontainers:masterfrom
stevenh:logrus-v1
Jul 27, 2017
Merged

Updated logrus to v1#1526
crosbymichael merged 1 commit intoopencontainers:masterfrom
stevenh:logrus-v1

Conversation

@stevenh
Copy link
Contributor

@stevenh stevenh commented Jul 19, 2017

Updated logrus to use v1 which includes a breaking name change Sirupsen -> sirupsen.

This includes a manual edit of the docker term package to also correct the name there too.

@stevenh
Copy link
Contributor Author

stevenh commented Jul 19, 2017

This replicates the changes done by #1511 but also updates vendor libs too.

Updated logrus to use v1 which includes a breaking name change Sirupsen -> sirupsen.

This includes a manual edit of the docker term package to also correct the name there too.

Signed-off-by: Steven Hartland <steven.hartland@multiplay.co.uk>
@stevenh
Copy link
Contributor Author

stevenh commented Jul 19, 2017

For reference this uses latest commit on 1-0-stable due to missing v1.0.2 tag.

@dqminh
Copy link
Contributor

dqminh commented Jul 25, 2017

fwiw, i added a new change to #1455 that removes usages of docker/term so we dont have to do manual edit here.

@stevenh
Copy link
Contributor Author

stevenh commented Jul 25, 2017

Thanks @dqminh if you prod me when that's merged I'll rebase to remove that part 👍

@dmcgowan
Copy link
Member

@dqminh can we get this merged and rebase #1455? Either that or poke some of the maintainers to review the other PR.

@dqminh
Copy link
Contributor

dqminh commented Jul 26, 2017

@dmcgowan i did a poke on the other PR. I didn't like this too much because it has a manual edit on a dependency.

One other way is just to move the docker/pkg dependencies wholesale here (i.e. not import them anymore). we only use 2 small packages there. containerd does have some similar mount code too, probably we can also extract them out ?

@dmcgowan
Copy link
Member

@dqminh the circular nature of these imports is pretty obnoxious. I am trying to push forward this change containerd/moby/docker*, wondering if it will be better to vendor logrus twice until everything is updated, I really hate manual vendor edits as well.

@dqminh
Copy link
Contributor

dqminh commented Jul 27, 2017

LGTM

i thought about this abit more and i think it would not be the end of the world if we merge this first before #1455. Since #1455 remove the term package anyway, and we dont update vendor that often (i dont see any pending PR that updates vendor ), i think merging this first has negilibile effect, we just have to be careful when updating vendor, but i hope we can merge #1455 soon 😛

Approved with PullApprove

@dqminh dqminh added this to the 1.0.0 milestone Jul 27, 2017
@crosbymichael
Copy link
Member

crosbymichael commented Jul 27, 2017

LGTM

Approved with PullApprove

@crosbymichael crosbymichael merged commit e775f0f into opencontainers:master Jul 27, 2017
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.

4 participants