Skip to content

Commit 31c5df3

Browse files
authored
Merge pull request #1918 from Random-Liu/update-containerd
Update containerd to v1.0.2.
2 parents 834edad + cdb1f2a commit 31c5df3

File tree

123 files changed

+7494
-11794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+7494
-11794
lines changed

Godeps/Godeps.json

Lines changed: 73 additions & 71 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

container/containerd/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/containerd/containerd/containers"
2626
"github.com/containerd/containerd/dialer"
2727
"github.com/containerd/containerd/errdefs"
28-
pempty "github.com/golang/protobuf/ptypes/empty"
28+
ptypes "github.com/gogo/protobuf/types"
2929
"google.golang.org/grpc"
3030
)
3131

@@ -101,7 +101,7 @@ func (c *client) TaskPid(ctx context.Context, id string) (uint32, error) {
101101
}
102102

103103
func (c *client) Version(ctx context.Context) (string, error) {
104-
response, err := c.versionService.Version(ctx, &pempty.Empty{})
104+
response, err := c.versionService.Version(ctx, &ptypes.Empty{})
105105
if err != nil {
106106
return "", errdefs.FromGRPC(err)
107107
}

0 commit comments

Comments
 (0)