github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #447 from Random-Liu/update-containerd

Browse Source 
Update containerd to fix long exec issue.
This commit is contained in:
Lantao Liu
2017-11-30 12:58:24 -08:00
committed by GitHub
parent dc7066d23f 5ed43ea1a3
commit 0db6e04ba1
31 changed files with 356 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/server/imagefs_info_test.go
View File

@@ -19,7 +19,7 @@ package server
import (
"testing"
"github.com/containerd/containerd/snapshot"
snapshot "github.com/containerd/containerd/snapshots"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.org/x/net/context"

2
pkg/server/snapshots.go
View File

@@ -22,7 +22,7 @@ import (
"time"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/snapshot"
snapshot "github.com/containerd/containerd/snapshots"
"github.com/golang/glog"
snapshotstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/snapshot"