@@ -4,7 +4,7 @@ TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a

 # When updating RUNC_COMMIT, also update runc in vendor.conf accordingly

 RUNC_COMMIT=b2567b37d7b75eb4cf325b77297b140ea686ce8f

-CONTAINERD_COMMIT=59bd1967112885c4d49e510e5570182865ba6fdd

+CONTAINERD_COMMIT=6bff39c643886dfa3d546e83a90a527b64ddeacf

 TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574

 LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e

 VNDR_COMMIT=a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384

@@ -103,15 +103,15 @@ github.com/googleapis/gax-go da06d194a00e19ce00d9011a13931c3f6f6887c7

 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944

 # containerd

-github.com/containerd/containerd 59bd1967112885c4d49e510e5570182865ba6fdd

+github.com/containerd/containerd 6bff39c643886dfa3d546e83a90a527b64ddeacf

 github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6

 github.com/containerd/continuity 35d55c5e8dd23b32037d56cf97174aff3efdfa83

-github.com/containerd/cgroups f7dd103d3e4e696aa67152f6b4ddd1779a3455a9

+github.com/containerd/cgroups 29da22c6171a4316169f9205ab6c49f59b5b852f

 github.com/containerd/console 84eeaae905fa414d03e07bcd6c8d3f19e7cf180e

 github.com/containerd/go-runc ed1cbe1fc31f5fb2359d3a54b6330d1a097858b7

 github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788

 github.com/dmcgowan/go-tar go1.10

-github.com/stevvooe/ttrpc bdb2ab7a8169e485e39421e666e15a505e575fd2

+github.com/stevvooe/ttrpc 8c92e22ce0c492875ccaac3ab06143a77d8ed0c1

 # cluster

 github.com/docker/swarmkit de950a7ed842c7b7e47e9451cde9bf8f96031894

@@ -310,7 +310,8 @@ func (c *cgroup) Thaw() error {

 }

 // OOMEventFD returns the memory cgroup's out of memory event fd that triggers

-// when processes inside the cgroup receive an oom event

+// when processes inside the cgroup receive an oom event. Returns

+// ErrMemoryNotSupported if memory cgroups is not supported.

 func (c *cgroup) OOMEventFD() (uintptr, error) {

 	c.mu.Lock()

 	defer c.mu.Unlock()

deleted file mode 100644

@@ -1,4265 +0,0 @@

-// Code generated by protoc-gen-gogo. DO NOT EDIT.

-// source: github.com/containerd/containerd/api/services/snapshot/v1/snapshots.proto

-

-/*

-	Package snapshot is a generated protocol buffer package.

-

-	It is generated from these files:

-		github.com/containerd/containerd/api/services/snapshot/v1/snapshots.proto

-

-	It has these top-level messages:

-		PrepareSnapshotRequest

-		PrepareSnapshotResponse

-		ViewSnapshotRequest

-		ViewSnapshotResponse

-		MountsRequest

-		MountsResponse

-		RemoveSnapshotRequest

-		CommitSnapshotRequest

-		StatSnapshotRequest

-		Info

-		StatSnapshotResponse

-		UpdateSnapshotRequest

-		UpdateSnapshotResponse

-		ListSnapshotsRequest

-		ListSnapshotsResponse

-		UsageRequest

-		UsageResponse

-*/

-package snapshot

-

-import proto "github.com/gogo/protobuf/proto"

-import fmt "fmt"

-import math "math"

-

-// skipping weak import gogoproto "github.com/gogo/protobuf/gogoproto"

-import google_protobuf1 "github.com/gogo/protobuf/types"

-import google_protobuf2 "github.com/gogo/protobuf/types"

-import _ "github.com/gogo/protobuf/types"

-import containerd_types "github.com/containerd/containerd/api/types"

-

-import time "time"

-

-import (

-	context "golang.org/x/net/context"

-	grpc "google.golang.org/grpc"

-)

-

-import github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"

-

-import strings "strings"

-import reflect "reflect"

-import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"

-

-import io "io"

-

-// Reference imports to suppress errors if they are not otherwise used.

-var _ = proto.Marshal

-var _ = fmt.Errorf

-var _ = math.Inf

-var _ = time.Kitchen

-

-// This is a compile-time assertion to ensure that this generated file

-// is compatible with the proto package it is being compiled against.

-// A compilation error at this line likely means your copy of the

-// proto package needs to be updated.

-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package

-

-type Kind int32

-

-const (

-	KindUnknown   Kind = 0

-	KindView      Kind = 1

-	KindActive    Kind = 2

-	KindCommitted Kind = 3

-)

-

-var Kind_name = map[int32]string{

-	0: "UNKNOWN",

-	1: "VIEW",

-	2: "ACTIVE",

-	3: "COMMITTED",

-}

-var Kind_value = map[string]int32{

-	"UNKNOWN":   0,

-	"VIEW":      1,

-	"ACTIVE":    2,

-	"COMMITTED": 3,

-}

-

-func (x Kind) String() string {

-	return proto.EnumName(Kind_name, int32(x))

-}

-func (Kind) EnumDescriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{0} }

-

-type PrepareSnapshotRequest struct {

-	Snapshotter string `protobuf:"bytes,1,opt,name=snapshotter,proto3" json:"snapshotter,omitempty"`

-	Key         string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"`

-	Parent      string `protobuf:"bytes,3,opt,name=parent,proto3" json:"parent,omitempty"`

-	// Labels are arbitrary data on snapshots.

-	//

-	// The combined size of a key/value pair cannot exceed 4096 bytes.

-	Labels map[string]string `protobuf:"bytes,4,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`

-}

-

-func (m *PrepareSnapshotRequest) Reset()                    { *m = PrepareSnapshotRequest{} }

-func (*PrepareSnapshotRequest) ProtoMessage()               {}

-func (*PrepareSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{0} }

-

-type PrepareSnapshotResponse struct {

-	Mounts []*containerd_types.Mount `protobuf:"bytes,1,rep,name=mounts" json:"mounts,omitempty"`

-}

-

-func (m *PrepareSnapshotResponse) Reset()                    { *m = PrepareSnapshotResponse{} }

-func (*PrepareSnapshotResponse) ProtoMessage()               {}

-func (*PrepareSnapshotResponse) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{1} }

-

-type ViewSnapshotRequest struct {

-	Snapshotter string `protobuf:"bytes,1,opt,name=snapshotter,proto3" json:"snapshotter,omitempty"`

-	Key         string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"`

-	Parent      string `protobuf:"bytes,3,opt,name=parent,proto3" json:"parent,omitempty"`

-	// Labels are arbitrary data on snapshots.

-	//

-	// The combined size of a key/value pair cannot exceed 4096 bytes.

-	Labels map[string]string `protobuf:"bytes,4,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`

-}

-

-func (m *ViewSnapshotRequest) Reset()                    { *m = ViewSnapshotRequest{} }

-func (*ViewSnapshotRequest) ProtoMessage()               {}

-func (*ViewSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{2} }

-

-type ViewSnapshotResponse struct {

-	Mounts []*containerd_types.Mount `protobuf:"bytes,1,rep,name=mounts" json:"mounts,omitempty"`

-}

-

-func (m *ViewSnapshotResponse) Reset()                    { *m = ViewSnapshotResponse{} }

-func (*ViewSnapshotResponse) ProtoMessage()               {}

-func (*ViewSnapshotResponse) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{3} }

-

-type MountsRequest struct {

-	Snapshotter string `protobuf:"bytes,1,opt,name=snapshotter,proto3" json:"snapshotter,omitempty"`

-	Key         string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"`

-}

-

-func (m *MountsRequest) Reset()                    { *m = MountsRequest{} }

-func (*MountsRequest) ProtoMessage()               {}

-func (*MountsRequest) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{4} }

-

-type MountsResponse struct {

-	Mounts []*containerd_types.Mount `protobuf:"bytes,1,rep,name=mounts" json:"mounts,omitempty"`

-}

-

-func (m *MountsResponse) Reset()                    { *m = MountsResponse{} }

-func (*MountsResponse) ProtoMessage()               {}

-func (*MountsResponse) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{5} }

-

-type RemoveSnapshotRequest struct {

-	Snapshotter string `protobuf:"bytes,1,opt,name=snapshotter,proto3" json:"snapshotter,omitempty"`

-	Key         string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"`

-}

-

-func (m *RemoveSnapshotRequest) Reset()                    { *m = RemoveSnapshotRequest{} }

-func (*RemoveSnapshotRequest) ProtoMessage()               {}

-func (*RemoveSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{6} }

-

-type CommitSnapshotRequest struct {

-	Snapshotter string `protobuf:"bytes,1,opt,name=snapshotter,proto3" json:"snapshotter,omitempty"`

-	Name        string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`

-	Key         string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`

-	// Labels are arbitrary data on snapshots.

-	//

-	// The combined size of a key/value pair cannot exceed 4096 bytes.

-	Labels map[string]string `protobuf:"bytes,4,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`

-}

-

-func (m *CommitSnapshotRequest) Reset()                    { *m = CommitSnapshotRequest{} }

-func (*CommitSnapshotRequest) ProtoMessage()               {}

-func (*CommitSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{7} }

-

-type StatSnapshotRequest struct {

-	Snapshotter string `protobuf:"bytes,1,opt,name=snapshotter,proto3" json:"snapshotter,omitempty"`

-	Key         string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"`

-}

-

-func (m *StatSnapshotRequest) Reset()                    { *m = StatSnapshotRequest{} }

-func (*StatSnapshotRequest) ProtoMessage()               {}

-func (*StatSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{8} }

-

-type Info struct {

-	Name   string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`

-	Parent string `protobuf:"bytes,2,opt,name=parent,proto3" json:"parent,omitempty"`

-	Kind   Kind   `protobuf:"varint,3,opt,name=kind,proto3,enum=containerd.services.snapshots.v1.Kind" json:"kind,omitempty"`

-	// CreatedAt provides the time at which the snapshot was created.

-	CreatedAt time.Time `protobuf:"bytes,4,opt,name=created_at,json=createdAt,stdtime" json:"created_at"`

-	// UpdatedAt provides the time the info was last updated.

-	UpdatedAt time.Time `protobuf:"bytes,5,opt,name=updated_at,json=updatedAt,stdtime" json:"updated_at"`

-	// Labels are arbitrary data on snapshots.

-	//

-	// The combined size of a key/value pair cannot exceed 4096 bytes.

-	Labels map[string]string `protobuf:"bytes,6,rep,name=labels" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`

-}

-

-func (m *Info) Reset()                    { *m = Info{} }

-func (*Info) ProtoMessage()               {}

-func (*Info) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{9} }

-

-type StatSnapshotResponse struct {

-	Info Info `protobuf:"bytes,1,opt,name=info" json:"info"`

-}

-

-func (m *StatSnapshotResponse) Reset()                    { *m = StatSnapshotResponse{} }

-func (*StatSnapshotResponse) ProtoMessage()               {}

-func (*StatSnapshotResponse) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{10} }

-

-type UpdateSnapshotRequest struct {

-	Snapshotter string `protobuf:"bytes,1,opt,name=snapshotter,proto3" json:"snapshotter,omitempty"`

-	Info        Info   `protobuf:"bytes,2,opt,name=info" json:"info"`

-	// UpdateMask specifies which fields to perform the update on. If empty,

-	// the operation applies to all fields.

-	//

-	// In info, Name, Parent, Kind, Created are immutable,

-	// other field may be updated using this mask.

-	// If no mask is provided, all mutable field are updated.

-	UpdateMask *google_protobuf2.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`

-}

-

-func (m *UpdateSnapshotRequest) Reset()                    { *m = UpdateSnapshotRequest{} }

-func (*UpdateSnapshotRequest) ProtoMessage()               {}

-func (*UpdateSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{11} }

-

-type UpdateSnapshotResponse struct {

-	Info Info `protobuf:"bytes,1,opt,name=info" json:"info"`

-}

-

-func (m *UpdateSnapshotResponse) Reset()                    { *m = UpdateSnapshotResponse{} }

-func (*UpdateSnapshotResponse) ProtoMessage()               {}

-func (*UpdateSnapshotResponse) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{12} }

-

-type ListSnapshotsRequest struct {

-	Snapshotter string `protobuf:"bytes,1,opt,name=snapshotter,proto3" json:"snapshotter,omitempty"`

-}

-

-func (m *ListSnapshotsRequest) Reset()                    { *m = ListSnapshotsRequest{} }

-func (*ListSnapshotsRequest) ProtoMessage()               {}

-func (*ListSnapshotsRequest) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{13} }

-

-type ListSnapshotsResponse struct {

-	Info []Info `protobuf:"bytes,1,rep,name=info" json:"info"`

-}

-

-func (m *ListSnapshotsResponse) Reset()                    { *m = ListSnapshotsResponse{} }

-func (*ListSnapshotsResponse) ProtoMessage()               {}

-func (*ListSnapshotsResponse) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{14} }

-

-type UsageRequest struct {

-	Snapshotter string `protobuf:"bytes,1,opt,name=snapshotter,proto3" json:"snapshotter,omitempty"`

-	Key         string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"`

-}

-

-func (m *UsageRequest) Reset()                    { *m = UsageRequest{} }

-func (*UsageRequest) ProtoMessage()               {}

-func (*UsageRequest) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{15} }

-

-type UsageResponse struct {

-	Size_  int64 `protobuf:"varint,1,opt,name=size,proto3" json:"size,omitempty"`

-	Inodes int64 `protobuf:"varint,2,opt,name=inodes,proto3" json:"inodes,omitempty"`

-}

-

-func (m *UsageResponse) Reset()                    { *m = UsageResponse{} }

-func (*UsageResponse) ProtoMessage()               {}

-func (*UsageResponse) Descriptor() ([]byte, []int) { return fileDescriptorSnapshots, []int{16} }

-

-func init() {

-	proto.RegisterType((*PrepareSnapshotRequest)(nil), "containerd.services.snapshots.v1.PrepareSnapshotRequest")

-	proto.RegisterType((*PrepareSnapshotResponse)(nil), "containerd.services.snapshots.v1.PrepareSnapshotResponse")

-	proto.RegisterType((*ViewSnapshotRequest)(nil), "containerd.services.snapshots.v1.ViewSnapshotRequest")

-	proto.RegisterType((*ViewSnapshotResponse)(nil), "containerd.services.snapshots.v1.ViewSnapshotResponse")

-	proto.RegisterType((*MountsRequest)(nil), "containerd.services.snapshots.v1.MountsRequest")

-	proto.RegisterType((*MountsResponse)(nil), "containerd.services.snapshots.v1.MountsResponse")

-	proto.RegisterType((*RemoveSnapshotRequest)(nil), "containerd.services.snapshots.v1.RemoveSnapshotRequest")

-	proto.RegisterType((*CommitSnapshotRequest)(nil), "containerd.services.snapshots.v1.CommitSnapshotRequest")

-	proto.RegisterType((*StatSnapshotRequest)(nil), "containerd.services.snapshots.v1.StatSnapshotRequest")

-	proto.RegisterType((*Info)(nil), "containerd.services.snapshots.v1.Info")

-	proto.RegisterType((*StatSnapshotResponse)(nil), "containerd.services.snapshots.v1.StatSnapshotResponse")

-	proto.RegisterType((*UpdateSnapshotRequest)(nil), "containerd.services.snapshots.v1.UpdateSnapshotRequest")

-	proto.RegisterType((*UpdateSnapshotResponse)(nil), "containerd.services.snapshots.v1.UpdateSnapshotResponse")

-	proto.RegisterType((*ListSnapshotsRequest)(nil), "containerd.services.snapshots.v1.ListSnapshotsRequest")

-	proto.RegisterType((*ListSnapshotsResponse)(nil), "containerd.services.snapshots.v1.ListSnapshotsResponse")

-	proto.RegisterType((*UsageRequest)(nil), "containerd.services.snapshots.v1.UsageRequest")

-	proto.RegisterType((*UsageResponse)(nil), "containerd.services.snapshots.v1.UsageResponse")

-	proto.RegisterEnum("containerd.services.snapshots.v1.Kind", Kind_name, Kind_value)

-}

-

-// Reference imports to suppress errors if they are not otherwise used.

-var _ context.Context

-var _ grpc.ClientConn

-

-// This is a compile-time assertion to ensure that this generated file

-// is compatible with the grpc package it is being compiled against.

-const _ = grpc.SupportPackageIsVersion4

-

-// Client API for Snapshots service

-

-type SnapshotsClient interface {

-	Prepare(ctx context.Context, in *PrepareSnapshotRequest, opts ...grpc.CallOption) (*PrepareSnapshotResponse, error)

-	View(ctx context.Context, in *ViewSnapshotRequest, opts ...grpc.CallOption) (*ViewSnapshotResponse, error)

-	Mounts(ctx context.Context, in *MountsRequest, opts ...grpc.CallOption) (*MountsResponse, error)

-	Commit(ctx context.Context, in *CommitSnapshotRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)

-	Remove(ctx context.Context, in *RemoveSnapshotRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)

-	Stat(ctx context.Context, in *StatSnapshotRequest, opts ...grpc.CallOption) (*StatSnapshotResponse, error)

-	Update(ctx context.Context, in *UpdateSnapshotRequest, opts ...grpc.CallOption) (*UpdateSnapshotResponse, error)

-	List(ctx context.Context, in *ListSnapshotsRequest, opts ...grpc.CallOption) (Snapshots_ListClient, error)

-	Usage(ctx context.Context, in *UsageRequest, opts ...grpc.CallOption) (*UsageResponse, error)

-}

-

-type snapshotsClient struct {

-	cc *grpc.ClientConn

-}

-

-func NewSnapshotsClient(cc *grpc.ClientConn) SnapshotsClient {

-	return &snapshotsClient{cc}

-}

-

-func (c *snapshotsClient) Prepare(ctx context.Context, in *PrepareSnapshotRequest, opts ...grpc.CallOption) (*PrepareSnapshotResponse, error) {

-	out := new(PrepareSnapshotResponse)

-	err := grpc.Invoke(ctx, "/containerd.services.snapshots.v1.Snapshots/Prepare", in, out, c.cc, opts...)

-	if err != nil {

-		return nil, err

-	}

-	return out, nil

-}

-

-func (c *snapshotsClient) View(ctx context.Context, in *ViewSnapshotRequest, opts ...grpc.CallOption) (*ViewSnapshotResponse, error) {

-	out := new(ViewSnapshotResponse)

-	err := grpc.Invoke(ctx, "/containerd.services.snapshots.v1.Snapshots/View", in, out, c.cc, opts...)

-	if err != nil {

-		return nil, err

-	}

-	return out, nil

-}

-

-func (c *snapshotsClient) Mounts(ctx context.Context, in *MountsRequest, opts ...grpc.CallOption) (*MountsResponse, error) {

-	out := new(MountsResponse)

-	err := grpc.Invoke(ctx, "/containerd.services.snapshots.v1.Snapshots/Mounts", in, out, c.cc, opts...)

-	if err != nil {

-		return nil, err

-	}

-	return out, nil

-}

-

-func (c *snapshotsClient) Commit(ctx context.Context, in *CommitSnapshotRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {

-	out := new(google_protobuf1.Empty)

-	err := grpc.Invoke(ctx, "/containerd.services.snapshots.v1.Snapshots/Commit", in, out, c.cc, opts...)

-	if err != nil {

-		return nil, err

-	}

-	return out, nil

-}

-

-func (c *snapshotsClient) Remove(ctx context.Context, in *RemoveSnapshotRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {

-	out := new(google_protobuf1.Empty)

-	err := grpc.Invoke(ctx, "/containerd.services.snapshots.v1.Snapshots/Remove", in, out, c.cc, opts...)

-	if err != nil {

-		return nil, err

-	}

-	return out, nil

-}

-

-func (c *snapshotsClient) Stat(ctx context.Context, in *StatSnapshotRequest, opts ...grpc.CallOption) (*StatSnapshotResponse, error) {

-	out := new(StatSnapshotResponse)

-	err := grpc.Invoke(ctx, "/containerd.services.snapshots.v1.Snapshots/Stat", in, out, c.cc, opts...)

-	if err != nil {

-		return nil, err

-	}

-	return out, nil

-}

-

-func (c *snapshotsClient) Update(ctx context.Context, in *UpdateSnapshotRequest, opts ...grpc.CallOption) (*UpdateSnapshotResponse, error) {

-	out := new(UpdateSnapshotResponse)

-	err := grpc.Invoke(ctx, "/containerd.services.snapshots.v1.Snapshots/Update", in, out, c.cc, opts...)

-	if err != nil {

-		return nil, err

-	}

-	return out, nil

-}

-

-func (c *snapshotsClient) List(ctx context.Context, in *ListSnapshotsRequest, opts ...grpc.CallOption) (Snapshots_ListClient, error) {

-	stream, err := grpc.NewClientStream(ctx, &_Snapshots_serviceDesc.Streams[0], c.cc, "/containerd.services.snapshots.v1.Snapshots/List", opts...)

-	if err != nil {

-		return nil, err

-	}

-	x := &snapshotsListClient{stream}

-	if err := x.ClientStream.SendMsg(in); err != nil {

-		return nil, err

-	}

-	if err := x.ClientStream.CloseSend(); err != nil {

-		return nil, err

-	}

-	return x, nil

-}

-

-type Snapshots_ListClient interface {

-	Recv() (*ListSnapshotsResponse, error)

-	grpc.ClientStream

-}

-

-type snapshotsListClient struct {

-	grpc.ClientStream

-}

-

-func (x *snapshotsListClient) Recv() (*ListSnapshotsResponse, error) {

-	m := new(ListSnapshotsResponse)

-	if err := x.ClientStream.RecvMsg(m); err != nil {

-		return nil, err

-	}

-	return m, nil

-}

-

-func (c *snapshotsClient) Usage(ctx context.Context, in *UsageRequest, opts ...grpc.CallOption) (*UsageResponse, error) {

-	out := new(UsageResponse)

-	err := grpc.Invoke(ctx, "/containerd.services.snapshots.v1.Snapshots/Usage", in, out, c.cc, opts...)

-	if err != nil {

-		return nil, err

-	}

-	return out, nil

-}

-

-// Server API for Snapshots service

-

-type SnapshotsServer interface {

-	Prepare(context.Context, *PrepareSnapshotRequest) (*PrepareSnapshotResponse, error)

-	View(context.Context, *ViewSnapshotRequest) (*ViewSnapshotResponse, error)

-	Mounts(context.Context, *MountsRequest) (*MountsResponse, error)

-	Commit(context.Context, *CommitSnapshotRequest) (*google_protobuf1.Empty, error)

-	Remove(context.Context, *RemoveSnapshotRequest) (*google_protobuf1.Empty, error)

-	Stat(context.Context, *StatSnapshotRequest) (*StatSnapshotResponse, error)

-	Update(context.Context, *UpdateSnapshotRequest) (*UpdateSnapshotResponse, error)

-	List(*ListSnapshotsRequest, Snapshots_ListServer) error

-	Usage(context.Context, *UsageRequest) (*UsageResponse, error)

-}

-

-func RegisterSnapshotsServer(s *grpc.Server, srv SnapshotsServer) {

-	s.RegisterService(&_Snapshots_serviceDesc, srv)

-}

-

-func _Snapshots_Prepare_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {

-	in := new(PrepareSnapshotRequest)

-	if err := dec(in); err != nil {

-		return nil, err

-	}

-	if interceptor == nil {

-		return srv.(SnapshotsServer).Prepare(ctx, in)

-	}

-	info := &grpc.UnaryServerInfo{

-		Server:     srv,

-		FullMethod: "/containerd.services.snapshots.v1.Snapshots/Prepare",

-	}

-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {

-		return srv.(SnapshotsServer).Prepare(ctx, req.(*PrepareSnapshotRequest))

-	}

-	return interceptor(ctx, in, info, handler)

-}

-

-func _Snapshots_View_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {

-	in := new(ViewSnapshotRequest)

-	if err := dec(in); err != nil {

-		return nil, err

-	}

-	if interceptor == nil {

-		return srv.(SnapshotsServer).View(ctx, in)

-	}

-	info := &grpc.UnaryServerInfo{

-		Server:     srv,

-		FullMethod: "/containerd.services.snapshots.v1.Snapshots/View",

-	}

-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {

-		return srv.(SnapshotsServer).View(ctx, req.(*ViewSnapshotRequest))

-	}

-	return interceptor(ctx, in, info, handler)

-}

-

-func _Snapshots_Mounts_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {

-	in := new(MountsRequest)

-	if err := dec(in); err != nil {

-		return nil, err

-	}

-	if interceptor == nil {

-		return srv.(SnapshotsServer).Mounts(ctx, in)

-	}

-	info := &grpc.UnaryServerInfo{

-		Server:     srv,

-		FullMethod: "/containerd.services.snapshots.v1.Snapshots/Mounts",

-	}

-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {

-		return srv.(SnapshotsServer).Mounts(ctx, req.(*MountsRequest))

-	}

-	return interceptor(ctx, in, info, handler)

-}

-

-func _Snapshots_Commit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {

-	in := new(CommitSnapshotRequest)

-	if err := dec(in); err != nil {

-		return nil, err

-	}

-	if interceptor == nil {

-		return srv.(SnapshotsServer).Commit(ctx, in)

-	}

-	info := &grpc.UnaryServerInfo{

-		Server:     srv,

-		FullMethod: "/containerd.services.snapshots.v1.Snapshots/Commit",

-	}

-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {

-		return srv.(SnapshotsServer).Commit(ctx, req.(*CommitSnapshotRequest))

-	}

-	return interceptor(ctx, in, info, handler)

-}

-

-func _Snapshots_Remove_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {

-	in := new(RemoveSnapshotRequest)

-	if err := dec(in); err != nil {

-		return nil, err

-	}

-	if interceptor == nil {

-		return srv.(SnapshotsServer).Remove(ctx, in)

-	}

-	info := &grpc.UnaryServerInfo{

-		Server:     srv,

-		FullMethod: "/containerd.services.snapshots.v1.Snapshots/Remove",

-	}

-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {

-		return srv.(SnapshotsServer).Remove(ctx, req.(*RemoveSnapshotRequest))

-	}

-	return interceptor(ctx, in, info, handler)

-}

-

-func _Snapshots_Stat_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {

-	in := new(StatSnapshotRequest)

-	if err := dec(in); err != nil {

-		return nil, err

-	}

-	if interceptor == nil {

-		return srv.(SnapshotsServer).Stat(ctx, in)

-	}

-	info := &grpc.UnaryServerInfo{

-		Server:     srv,

-		FullMethod: "/containerd.services.snapshots.v1.Snapshots/Stat",

-	}

-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {

-		return srv.(SnapshotsServer).Stat(ctx, req.(*StatSnapshotRequest))

-	}

-	return interceptor(ctx, in, info, handler)

-}

-

-func _Snapshots_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {

-	in := new(UpdateSnapshotRequest)

-	if err := dec(in); err != nil {

-		return nil, err

-	}

-	if interceptor == nil {

-		return srv.(SnapshotsServer).Update(ctx, in)

-	}

-	info := &grpc.UnaryServerInfo{

-		Server:     srv,

-		FullMethod: "/containerd.services.snapshots.v1.Snapshots/Update",

-	}

-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {

-		return srv.(SnapshotsServer).Update(ctx, req.(*UpdateSnapshotRequest))

-	}

-	return interceptor(ctx, in, info, handler)

-}

-

-func _Snapshots_List_Handler(srv interface{}, stream grpc.ServerStream) error {

-	m := new(ListSnapshotsRequest)

-	if err := stream.RecvMsg(m); err != nil {

-		return err

-	}

-	return srv.(SnapshotsServer).List(m, &snapshotsListServer{stream})

-}

-

-type Snapshots_ListServer interface {

-	Send(*ListSnapshotsResponse) error

-	grpc.ServerStream

-}

-

-type snapshotsListServer struct {

-	grpc.ServerStream

-}

-

-func (x *snapshotsListServer) Send(m *ListSnapshotsResponse) error {

-	return x.ServerStream.SendMsg(m)

-}

-

-func _Snapshots_Usage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {

-	in := new(UsageRequest)

-	if err := dec(in); err != nil {

-		return nil, err

-	}

-	if interceptor == nil {

-		return srv.(SnapshotsServer).Usage(ctx, in)

-	}

-	info := &grpc.UnaryServerInfo{

-		Server:     srv,

-		FullMethod: "/containerd.services.snapshots.v1.Snapshots/Usage",

-	}

-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {

-		return srv.(SnapshotsServer).Usage(ctx, req.(*UsageRequest))

-	}

-	return interceptor(ctx, in, info, handler)

-}

-

-var _Snapshots_serviceDesc = grpc.ServiceDesc{

-	ServiceName: "containerd.services.snapshots.v1.Snapshots",

-	HandlerType: (*SnapshotsServer)(nil),

-	Methods: []grpc.MethodDesc{

-		{

-			MethodName: "Prepare",

-			Handler:    _Snapshots_Prepare_Handler,

-		},

-		{

-			MethodName: "View",

-			Handler:    _Snapshots_View_Handler,

-		},

-		{

-			MethodName: "Mounts",

-			Handler:    _Snapshots_Mounts_Handler,

-		},

-		{

-			MethodName: "Commit",

-			Handler:    _Snapshots_Commit_Handler,

-		},

-		{

-			MethodName: "Remove",

-			Handler:    _Snapshots_Remove_Handler,

-		},

-		{

-			MethodName: "Stat",

-			Handler:    _Snapshots_Stat_Handler,

-		},

-		{

-			MethodName: "Update",

-			Handler:    _Snapshots_Update_Handler,

-		},

-		{

-			MethodName: "Usage",

-			Handler:    _Snapshots_Usage_Handler,

-		},

-	},

-	Streams: []grpc.StreamDesc{

-		{

-			StreamName:    "List",

-			Handler:       _Snapshots_List_Handler,

-			ServerStreams: true,

-		},

-	},

-	Metadata: "github.com/containerd/containerd/api/services/snapshot/v1/snapshots.proto",

-}

-

-func (m *PrepareSnapshotRequest) Marshal() (dAtA []byte, err error) {

-	size := m.Size()

-	dAtA = make([]byte, size)

-	n, err := m.MarshalTo(dAtA)

-	if err != nil {

-		return nil, err

-	}

-	return dAtA[:n], nil

-}

-

-func (m *PrepareSnapshotRequest) MarshalTo(dAtA []byte) (int, error) {

-	var i int

-	_ = i

-	var l int

-	_ = l

-	if len(m.Snapshotter) > 0 {

-		dAtA[i] = 0xa

-		i++

-		i = encodeVarintSnapshots(dAtA, i, uint64(len(m.Snapshotter)))

-		i += copy(dAtA[i:], m.Snapshotter)

-	}

-	if len(m.Key) > 0 {

-		dAtA[i] = 0x12

-		i++

-		i = encodeVarintSnapshots(dAtA, i, uint64(len(m.Key)))

-		i += copy(dAtA[i:], m.Key)

-	}

-	if len(m.Parent) > 0 {

-		dAtA[i] = 0x1a

-		i++

-		i = encodeVarintSnapshots(dAtA, i, uint64(len(m.Parent)))

-		i += copy(dAtA[i:], m.Parent)

-	}

-	if len(m.Labels) > 0 {

-		for k, _ := range m.Labels {

-			dAtA[i] = 0x22

-			i++

-			v := m.Labels[k]

-			mapSize := 1 + len(k) + sovSnapshots(uint64(len(k))) + 1 + len(v) + sovSnapshots(uint64(len(v)))

-			i = encodeVarintSnapshots(dAtA, i, uint64(mapSize))

-			dAtA[i] = 0xa

-			i++

-			i = encodeVarintSnapshots(dAtA, i, uint64(len(k)))

-			i += copy(dAtA[i:], k)

-			dAtA[i] = 0x12

-			i++

-			i = encodeVarintSnapshots(dAtA, i, uint64(len(v)))

-			i += copy(dAtA[i:], v)

-		}

-	}

-	return i, nil

-}

-

-func (m *PrepareSnapshotResponse) Marshal() (dAtA []byte, err error) {

-	size := m.Size()

-	dAtA = make([]byte, size)

-	n, err := m.MarshalTo(dAtA)

-	if err != nil {

-		return nil, err

-	}

-	return dAtA[:n], nil

-}

-

-func (m *PrepareSnapshotResponse) MarshalTo(dAtA []byte) (int, error) {

-	var i int

-	_ = i

-	var l int

-	_ = l

-	if len(m.Mounts) > 0 {

-		for _, msg := range m.Mounts {

-			dAtA[i] = 0xa

-			i++

-			i = encodeVarintSnapshots(dAtA, i, uint64(msg.Size()))

-			n, err := msg.MarshalTo(dAtA[i:])

-			if err != nil {

-				return 0, err

-			}

-			i += n

-		}

-	}

-	return i, nil

-}

-

-func (m *ViewSnapshotRequest) Marshal() (dAtA []byte, err error) {

-	size := m.Size()

-	dAtA = make([]byte, size)

-	n, err := m.MarshalTo(dAtA)

-	if err != nil {

-		return nil, err

-	}

-	return dAtA[:n], nil

-}

-

-func (m *ViewSnapshotRequest) MarshalTo(dAtA []byte) (int, error) {

-	var i int

-	_ = i

-	var l int

-	_ = l

-	if len(m.Snapshotter) > 0 {

-		dAtA[i] = 0xa

-		i++

-		i = encodeVarintSnapshots(dAtA, i, uint64(len(m.Snapshotter)))

-		i += copy(dAtA[i:], m.Snapshotter)

-	}

-	if len(m.Key) > 0 {

-		dAtA[i] = 0x12

-		i++

-		i = encodeVarintSnapshots(dAtA, i, uint64(len(m.Key)))

-		i += copy(dAtA[i:], m.Key)

-	}

-	if len(m.Parent) > 0 {

-		dAtA[i] = 0x1a

-		i++

-		i = encodeVarintSnapshots(dAtA, i, uint64(len(m.Parent)))

-		i += copy(dAtA[i:], m.Parent)

-	}

-	if len(m.Labels) > 0 {

-		for k, _ := range m.Labels {

-			dAtA[i] = 0x22

-			i++

-			v := m.Labels[k]

-			mapSize := 1 + len(k) + sovSnapshots(uint64(len(k))) + 1 + len(v) + sovSnapshots(uint64(len(v)))

-			i = encodeVarintSnapshots(dAtA, i, uint64(mapSize))

-			dAtA[i] = 0xa

-			i++

-			i = encodeVarintSnapshots(dAtA, i, uint64(len(k)))

-			i += copy(dAtA[i:], k)

-			dAtA[i] = 0x12

-			i++

-			i = encodeVarintSnapshots(dAtA, i, uint64(len(v)))

-			i += copy(dAtA[i:], v)

-		}

-	}

-	return i, nil

-}

-

-func (m *ViewSnapshotResponse) Marshal() (dAtA []byte, err error) {

-	size := m.Size()

-	dAtA = make([]byte, size)

-	n, err := m.MarshalTo(dAtA)

-	if err != nil {

-		return nil, err

-	}

-	return dAtA[:n], nil

-}

-

-func (m *ViewSnapshotResponse) MarshalTo(dAtA []byte) (int, error) {

-	var i int

-	_ = i

-	var l int

-	_ = l

-	if len(m.Mounts) > 0 {

-		for _, msg := range m.Mounts {

-			dAtA[i] = 0xa

-			i++

-			i = encodeVarintSnapshots(dAtA, i, uint64(msg.Size()))

-			n, err := msg.MarshalTo(dAtA[i:])

-			if err != nil {

-				return 0, err

-			}

-			i += n

-		}

-	}

-	return i, nil

-}

-

-func (m *MountsRequest) Marshal() (dAtA []byte, err error) {

-	size := m.Size()

-	dAtA = make([]byte, size)

-	n, err := m.MarshalTo(dAtA)

-	if err != nil {

-		return nil, err

-	}

-	return dAtA[:n], nil