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.

Sign up for GitHub

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

Jump to bottom

go.mod: bump containerd/cgroups #828

Merged
merged 1 commit into from Jun 5, 2020
Merged

go.mod: bump containerd/cgroups #828

merged 1 commit into from Jun 5, 2020

Conversation

kolyshkin
Copy link
Contributor

This is mostly to update dependencies.

@kolyshkin kolyshkin requested a review from a team as a code owner June 1, 2020 20:42
@msftclas
Copy link

msftclas commented Jun 1, 2020 •
edited

CLA assistant check
All CLA requirements met.

@katiewasnothere
Copy link
Contributor

Hi, unfortunately, this is a breaking change due to the api break mentioned here golang/go#34610. We would additionally need to update https://github.com/microsoft/go-winio and fix breaking changes there in order to take this.

@kolyshkin
Copy link
Contributor Author

Hi, unfortunately, this is a breaking change due to the api break mentioned here golang/go#34610. We would additionally need to update https://github.com/microsoft/go-winio and fix breaking changes there in order to take this.

Yeah, I see that :-(

Let's see how easy it is to fix this.

@kolyshkin
Copy link
Contributor Author

Hmm, unless I'm missing something big the fix was relatively easy; please see the second commit @katiewasnothere

@kolyshkin kolyshkin mentioned this pull request Jun 1, 2020
Open
@katiewasnothere
Copy link
Contributor

I'm made a new PR for the necessary go-winio changes here microsoft/go-winio#172 fyi

@katiewasnothere
Copy link
Contributor

This looks good to me. Could you squash the commits into one?

@kolyshkin
go.mod: bump containerd/cgroups etc
25885de 
This is mostly to update dependencies.

Since we have updated x/sys/windows, make cmd/containerd-shim-runhcs-v1
use the new windows.SecurityDescriptorFromString(), removing the ugly
unsafe cast.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin
Copy link
Contributor Author

This looks good to me. Could you squash the commits into one?

sure, done @katiewasnothere

katiewasnothere
katiewasnothere approved these changes Jun 5, 2020
View reviewed changes
Copy link
Contributor

@katiewasnothere katiewasnothere left a comment •
edited

Choose a reason for hiding this comment

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

LGTM. Merging.

@katiewasnothere katiewasnothere merged commit 971423b into microsoft:master Jun 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@katiewasnothere katiewasnothere katiewasnothere approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@kolyshkin @msftclas @katiewasnothere