Skip to content
This repository has been archived by the owner on Mar 9, 2022. It is now read-only.

Update containerd #431

Merged
merged 2 commits into from Nov 27, 2017
Merged

Conversation

Random-Liu
Copy link
Member

@Random-Liu Random-Liu commented Nov 27, 2017

Pickup commits from #430 and update containerd to 70e0c8443ff15dcbd2ad8e0d07ed087fc2a83e05.

This includes fixes we need:

With this PR, you should be able to work on #389. /cc @yanxuean
Fixes #423

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

/LGTM

@@ -17,7 +17,8 @@ limitations under the License.
package server

import (
"github.com/containerd/containerd"
containerdio "github.com/containerd/containerd/cio"
eventtypes "github.com/containerd/containerd/api/events"
Copy link
Member

Choose a reason for hiding this comment

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

ok that makes sense.. wish those were defined in a better place

yanxuean and others added 2 commits November 27, 2017 19:24
fix containerd#423

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
Signed-off-by: Lantao Liu <lantaol@google.com>
@Random-Liu Random-Liu merged commit 80c7d18 into containerd:master Nov 27, 2017
@Random-Liu Random-Liu deleted the update-containerd branch November 27, 2017 20:03
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update containerd
4 participants