@@ -139,7 +139,7 @@ clone git github.com/docker/docker-credential-helpers v0.3.0

 clone git github.com/docker/containerd 860f3a94940894ac0a106eff4bd1616a67407ee2

 # cluster

-clone git github.com/docker/swarmkit 45094b473cbdb2d45e4d8f703fb615989399ae29

+clone git github.com/docker/swarmkit 25572005febb76c2cc5f7e37d878615e6fe330f9

 clone git github.com/golang/mock bd3c8e81be01eef76d4b503f5e687d2d1354d2d9

 clone git github.com/gogo/protobuf 43a2e0b1c32252bfbbdf81f7faa7a88fb3fa4028

 clone git github.com/cloudflare/cfssl 92f037e39eb103fb30f9151be40d9ed267fc4ae2

@@ -622,15 +622,18 @@ func (n *Node) runManager(ctx context.Context, securityConfig *ca.SecurityConfig

 			select {

 			case <-ctx.Done():

+				m.Stop(context.Background()) // todo: this should be sync like other components

 			case <-n.waitRole(ctx, ca.AgentRole):

 			}

-			m.Stop(context.Background()) // todo: this should be sync like other components

 			<-done

 			ready = nil // ready event happens once, even on multiple starts

 			n.Lock()

 			n.manager = nil

+			if n.conn != nil {

+				n.conn.Close()

+			}

 			n.Unlock()

 			if ctx.Err() != nil {

@@ -349,20 +349,13 @@ func (m *ListNetworksResponse) Reset()                    { *m = ListNetworksRes

 func (*ListNetworksResponse) ProtoMessage()               {}

 func (*ListNetworksResponse) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{31} }

-type RemoveManagerResponse struct {

-}

-

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

-func (*RemoveManagerResponse) ProtoMessage()               {}

-func (*RemoveManagerResponse) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{32} }

-

 type GetClusterRequest struct {

 	ClusterID string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`

 }

 func (m *GetClusterRequest) Reset()                    { *m = GetClusterRequest{} }

 func (*GetClusterRequest) ProtoMessage()               {}

-func (*GetClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{33} }

+func (*GetClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{32} }

 type GetClusterResponse struct {

 	Cluster *Cluster `protobuf:"bytes,1,opt,name=cluster" json:"cluster,omitempty"`

@@ -370,7 +363,7 @@ type GetClusterResponse struct {

 func (m *GetClusterResponse) Reset()                    { *m = GetClusterResponse{} }

 func (*GetClusterResponse) ProtoMessage()               {}

-func (*GetClusterResponse) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{34} }

+func (*GetClusterResponse) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{33} }

 type ListClustersRequest struct {

 	Filters *ListClustersRequest_Filters `protobuf:"bytes,1,opt,name=filters" json:"filters,omitempty"`

@@ -378,7 +371,7 @@ type ListClustersRequest struct {

 func (m *ListClustersRequest) Reset()                    { *m = ListClustersRequest{} }

 func (*ListClustersRequest) ProtoMessage()               {}

-func (*ListClustersRequest) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{35} }

+func (*ListClustersRequest) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{34} }

 type ListClustersRequest_Filters struct {

 	Names      []string          `protobuf:"bytes,1,rep,name=names" json:"names,omitempty"`

@@ -389,7 +382,7 @@ type ListClustersRequest_Filters struct {

 func (m *ListClustersRequest_Filters) Reset()      { *m = ListClustersRequest_Filters{} }

 func (*ListClustersRequest_Filters) ProtoMessage() {}

 func (*ListClustersRequest_Filters) Descriptor() ([]byte, []int) {

-	return fileDescriptorControl, []int{35, 0}

+	return fileDescriptorControl, []int{34, 0}

 }

 type ListClustersResponse struct {

@@ -398,7 +391,7 @@ type ListClustersResponse struct {

 func (m *ListClustersResponse) Reset()                    { *m = ListClustersResponse{} }

 func (*ListClustersResponse) ProtoMessage()               {}

-func (*ListClustersResponse) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{36} }

+func (*ListClustersResponse) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{35} }

 type UpdateClusterRequest struct {

 	// ClusterID is the cluster ID to update.

@@ -411,7 +404,7 @@ type UpdateClusterRequest struct {

 func (m *UpdateClusterRequest) Reset()                    { *m = UpdateClusterRequest{} }

 func (*UpdateClusterRequest) ProtoMessage()               {}

-func (*UpdateClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{37} }

+func (*UpdateClusterRequest) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{36} }

 type UpdateClusterResponse struct {

 	Cluster *Cluster `protobuf:"bytes,1,opt,name=cluster" json:"cluster,omitempty"`

@@ -419,7 +412,7 @@ type UpdateClusterResponse struct {

 func (m *UpdateClusterResponse) Reset()                    { *m = UpdateClusterResponse{} }

 func (*UpdateClusterResponse) ProtoMessage()               {}

-func (*UpdateClusterResponse) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{38} }

+func (*UpdateClusterResponse) Descriptor() ([]byte, []int) { return fileDescriptorControl, []int{37} }

 func init() {

 	proto.RegisterType((*GetNodeRequest)(nil), "docker.swarmkit.v1.GetNodeRequest")

@@ -458,7 +451,6 @@ func init() {

 	proto.RegisterType((*ListNetworksRequest)(nil), "docker.swarmkit.v1.ListNetworksRequest")

 	proto.RegisterType((*ListNetworksRequest_Filters)(nil), "docker.swarmkit.v1.ListNetworksRequest.Filters")

 	proto.RegisterType((*ListNetworksResponse)(nil), "docker.swarmkit.v1.ListNetworksResponse")

-	proto.RegisterType((*RemoveManagerResponse)(nil), "docker.swarmkit.v1.RemoveManagerResponse")

 	proto.RegisterType((*GetClusterRequest)(nil), "docker.swarmkit.v1.GetClusterRequest")

 	proto.RegisterType((*GetClusterResponse)(nil), "docker.swarmkit.v1.GetClusterResponse")

 	proto.RegisterType((*ListClustersRequest)(nil), "docker.swarmkit.v1.ListClustersRequest")

@@ -1193,16 +1185,6 @@ func (m *ListNetworksResponse) Copy() *ListNetworksResponse {

 	return o

 }

-func (m *RemoveManagerResponse) Copy() *RemoveManagerResponse {

-	if m == nil {

-		return nil

-	}

-

-	o := &RemoveManagerResponse{}

-

-	return o

-}

-

 func (m *GetClusterRequest) Copy() *GetClusterRequest {

 	if m == nil {

 		return nil

@@ -1780,15 +1762,6 @@ func (this *ListNetworksResponse) GoString() string {

 	s = append(s, "}")

 	return strings.Join(s, "")

 }

-func (this *RemoveManagerResponse) GoString() string {

-	if this == nil {

-		return "nil"

-	}

-	s := make([]string, 0, 4)

-	s = append(s, "&api.RemoveManagerResponse{")

-	s = append(s, "}")

-	return strings.Join(s, "")

-}

 func (this *GetClusterRequest) GoString() string {

 	if this == nil {

 		return "nil"

@@ -3765,24 +3738,6 @@ func (m *ListNetworksResponse) MarshalTo(data []byte) (int, error) {

 	return i, nil

 }

-func (m *RemoveManagerResponse) 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 *RemoveManagerResponse) MarshalTo(data []byte) (int, error) {

-	var i int

-	_ = i

-	var l int

-	_ = l

-	return i, nil

-}

-

 func (m *GetClusterRequest) Marshal() (data []byte, err error) {

 	size := m.Size()

 	data = make([]byte, size)

@@ -4874,12 +4829,6 @@ func (m *ListNetworksResponse) Size() (n int) {

 	return n

 }

-func (m *RemoveManagerResponse) Size() (n int) {

-	var l int

-	_ = l

-	return n

-}

-

 func (m *GetClusterRequest) Size() (n int) {

 	var l int

 	_ = l

@@ -5404,15 +5353,6 @@ func (this *ListNetworksResponse) String() string {

 	}, "")

 	return s

 }

-func (this *RemoveManagerResponse) String() string {

-	if this == nil {

-		return "nil"

-	}

-	s := strings.Join([]string{`&RemoveManagerResponse{`,

-		`}`,

-	}, "")

-	return s

-}

 func (this *GetClusterRequest) String() string {

 	if this == nil {

 		return "nil"

@@ -9165,56 +9105,6 @@ func (m *ListNetworksResponse) Unmarshal(data []byte) error {

 	}

 	return nil

 }

-func (m *RemoveManagerResponse) Unmarshal(data []byte) error {

-	l := len(data)

-	iNdEx := 0

-	for iNdEx < l {

-		preIndex := iNdEx

-		var wire uint64

-		for shift := uint(0); ; shift += 7 {

-			if shift >= 64 {

-				return ErrIntOverflowControl

-			}

-			if iNdEx >= l {

-				return io.ErrUnexpectedEOF

-			}

-			b := data[iNdEx]

-			iNdEx++

-			wire |= (uint64(b) & 0x7F) << shift

-			if b < 0x80 {

-				break

-			}

-		}

-		fieldNum := int32(wire >> 3)

-		wireType := int(wire & 0x7)

-		if wireType == 4 {

-			return fmt.Errorf("proto: RemoveManagerResponse: wiretype end group for non-group")

-		}

-		if fieldNum <= 0 {

-			return fmt.Errorf("proto: RemoveManagerResponse: illegal tag %d (wire type %d)", fieldNum, wire)

-		}

-		switch fieldNum {

-		default:

-			iNdEx = preIndex

-			skippy, err := skipControl(data[iNdEx:])

-			if err != nil {

-				return err

-			}

-			if skippy < 0 {

-				return ErrInvalidLengthControl

-			}

-			if (iNdEx + skippy) > l {

-				return io.ErrUnexpectedEOF

-			}

-			iNdEx += skippy

-		}

-	}

-

-	if iNdEx > l {

-		return io.ErrUnexpectedEOF

-	}

-	return nil

-}

 func (m *GetClusterRequest) Unmarshal(data []byte) error {

 	l := len(data)

 	iNdEx := 0

@@ -10094,92 +9984,92 @@ var (

 )

 var fileDescriptorControl = []byte{

-	// 1391 bytes of a gzipped FileDescriptorProto

-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x59, 0x4f, 0x6f, 0x1b, 0x45,

-	0x14, 0xc7, 0x4e, 0x1b, 0xd7, 0xcf, 0x75, 0xd2, 0x4c, 0x1d, 0x11, 0xb9, 0x21, 0x45, 0x5b, 0x48,

-	0x13, 0x29, 0x38, 0xe0, 0xa8, 0x22, 0x80, 0x04, 0x22, 0x09, 0x45, 0x16, 0x6d, 0xa8, 0x36, 0x14,

-	0x71, 0x8b, 0x1c, 0x7b, 0x1a, 0x96, 0xd8, 0x5e, 0xb3, 0xbb, 0x49, 0x1b, 0x71, 0xe1, 0x63, 0xf0,

-	0x19, 0x38, 0x70, 0xe7, 0xc4, 0x81, 0x4b, 0xc5, 0x89, 0x0b, 0x12, 0x48, 0x08, 0xb5, 0xfd, 0x00,

-	0x88, 0x0f, 0xc0, 0x81, 0x99, 0x9d, 0x37, 0xbb, 0xeb, 0xf1, 0xec, 0xac, 0x1d, 0xa7, 0xa2, 0x07,

-	0xab, 0xde, 0xd9, 0xdf, 0xfb, 0x37, 0xef, 0xf7, 0x5e, 0xde, 0x73, 0xa1, 0xdc, 0x72, 0x7b, 0x81,

-	0xe7, 0x76, 0x6a, 0x7d, 0xcf, 0x0d, 0x5c, 0x42, 0xda, 0x6e, 0xeb, 0x88, 0x7a, 0x35, 0xff, 0x61,

-	0xd3, 0xeb, 0x1e, 0x39, 0x41, 0xed, 0xe4, 0xad, 0x6a, 0xc9, 0xef, 0xd3, 0x96, 0x2f, 0x00, 0xd5,

-	0xb2, 0x7b, 0xf0, 0x15, 0x6d, 0x05, 0xf2, 0xb1, 0x14, 0x9c, 0xf6, 0xa9, 0x7c, 0xa8, 0x1c, 0xba,

-	0x87, 0x6e, 0xf8, 0x75, 0x9d, 0x7f, 0xc3, 0xd3, 0xab, 0xfd, 0xce, 0xf1, 0xa1, 0xd3, 0x5b, 0x17,

-	0xff, 0x88, 0x43, 0xeb, 0x16, 0xcc, 0x7c, 0x4c, 0x83, 0x5d, 0xb7, 0x4d, 0x6d, 0xfa, 0xf5, 0x31,

-	0xf5, 0x03, 0x72, 0x03, 0x0a, 0x3d, 0xf6, 0xb8, 0xef, 0xb4, 0x17, 0x72, 0xaf, 0xe6, 0x56, 0x8a,

-	0x5b, 0xf0, 0xec, 0xaf, 0xeb, 0xd3, 0x1c, 0xd1, 0xd8, 0xb1, 0xa7, 0xf9, 0xab, 0x46, 0xdb, 0xfa,

-	0x00, 0x66, 0x23, 0x31, 0xbf, 0xef, 0xf6, 0x7c, 0x4a, 0xd6, 0xe0, 0x02, 0x7f, 0x19, 0x0a, 0x95,

-	0xea, 0x0b, 0xb5, 0xe1, 0x00, 0x6a, 0x21, 0x3e, 0x44, 0x59, 0x3f, 0x4e, 0xc1, 0x95, 0x3b, 0x8e,

-	0x1f, 0xaa, 0xf0, 0xa5, 0xe9, 0xdb, 0x50, 0x78, 0xe0, 0x74, 0x02, 0xea, 0xf9, 0xa8, 0x65, 0x4d,

-	0xa7, 0x45, 0x15, 0xab, 0xdd, 0x16, 0x32, 0xb6, 0x14, 0xae, 0xfe, 0x99, 0x87, 0x02, 0x1e, 0x92,

-	0x0a, 0x5c, 0xec, 0x35, 0xbb, 0x94, 0x6b, 0x9c, 0x5a, 0x29, 0xda, 0xe2, 0x81, 0xac, 0x43, 0xc9,

-	0x69, 0xef, 0xf7, 0x3d, 0xfa, 0xc0, 0x79, 0xc4, 0xde, 0xe5, 0xf9, 0xbb, 0xad, 0x19, 0x16, 0x28,

-	0x34, 0x76, 0xee, 0xe1, 0xa9, 0x0d, 0x4e, 0x5b, 0x7e, 0x27, 0xf7, 0x60, 0xba, 0xd3, 0x3c, 0xa0,

-	0x1d, 0x7f, 0x61, 0x8a, 0x61, 0x4b, 0xf5, 0xcd, 0x71, 0x3c, 0xab, 0xdd, 0x09, 0x45, 0x3f, 0x62,

-	0x09, 0x3e, 0xb5, 0x51, 0x0f, 0x69, 0x40, 0xa9, 0x4b, 0xbb, 0x07, 0xec, 0xf5, 0x97, 0x4e, 0xdf,

-	0x5f, 0xb8, 0xc0, 0xd4, 0xce, 0xd4, 0x6f, 0xa6, 0x5d, 0xdb, 0x1e, 0x4b, 0x7d, 0xed, 0x6e, 0x84,

-	0xb7, 0x93, 0xb2, 0xa4, 0x0e, 0x17, 0x19, 0x73, 0x58, 0x1c, 0x17, 0x43, 0x25, 0x8b, 0xa9, 0x77,

-	0xcf, 0x40, 0xb6, 0x80, 0x56, 0xdf, 0x81, 0x52, 0xc2, 0x2b, 0x72, 0x05, 0xa6, 0x8e, 0xe8, 0xa9,

-	0xc8, 0xb8, 0xcd, 0xbf, 0xf2, 0x8b, 0x3b, 0x69, 0x76, 0x8e, 0x29, 0xbb, 0x1c, 0x7e, 0x26, 0x1e,

-	0xde, 0xcd, 0x6f, 0xe6, 0xac, 0x6d, 0x98, 0x4b, 0x44, 0x8a, 0xe9, 0xaf, 0xb1, 0x7b, 0xe6, 0x07,

-	0xe1, 0x3d, 0x9b, 0xf2, 0x2f, 0x60, 0xd6, 0xf7, 0x39, 0x98, 0xbb, 0xdf, 0x6f, 0x37, 0x03, 0x3a,

-	0x2e, 0xf9, 0xc8, 0xfb, 0x70, 0x39, 0x04, 0x9d, 0xb0, 0xf8, 0x1d, 0xb7, 0x17, 0x3a, 0x58, 0xaa,

-	0x5f, 0xd3, 0x59, 0xfc, 0x5c, 0x40, 0xec, 0x12, 0x17, 0xc0, 0x07, 0xf2, 0x26, 0x5c, 0xe0, 0x95,

-	0xc4, 0x32, 0xc9, 0xe5, 0x16, 0x4d, 0x57, 0x6e, 0x87, 0x48, 0x6b, 0x0b, 0x48, 0xd2, 0xd7, 0x33,

-	0x31, 0x7e, 0x13, 0xe6, 0x6c, 0xda, 0x75, 0x4f, 0xc6, 0x8e, 0xd7, 0xaa, 0x00, 0x49, 0x4a, 0x0a,

-	0xeb, 0x58, 0xb9, 0x9f, 0x35, 0xfd, 0xa3, 0x84, 0xb2, 0x80, 0x3d, 0x2a, 0xca, 0x38, 0x82, 0x2b,

-	0xe3, 0xaf, 0xa2, 0xca, 0x15, 0x62, 0x71, 0x1c, 0xfc, 0xa5, 0x29, 0x8e, 0x10, 0x1f, 0xa2, 0xe2,

-	0x38, 0xc6, 0x36, 0x1d, 0xc5, 0x91, 0xb4, 0x6e, 0xfd, 0x81, 0x9d, 0x80, 0x1f, 0x9e, 0xa1, 0x13,

-	0x24, 0xc5, 0x86, 0x3b, 0xc1, 0xbf, 0xff, 0x63, 0x27, 0xd0, 0x79, 0xa6, 0xed, 0x04, 0xcc, 0x05,

-	0x9f, 0x7a, 0x27, 0x4e, 0x8b, 0xf3, 0x40, 0x74, 0x02, 0x74, 0x61, 0x4f, 0x1c, 0x37, 0x76, 0x98,

-	0x0b, 0x08, 0x69, 0xb4, 0x7d, 0xb2, 0x0c, 0x97, 0x90, 0x35, 0xa2, 0xe4, 0x8b, 0x5b, 0x25, 0x86,

-	0x2e, 0x08, 0xda, 0xb0, 0xe8, 0x05, 0x6f, 0x7c, 0xb2, 0x03, 0x33, 0xac, 0xd4, 0x1c, 0x8f, 0xb6,

-	0xf7, 0xfd, 0x80, 0xb1, 0xd7, 0x5f, 0x98, 0x0e, 0x1b, 0xc4, 0x2b, 0x69, 0x29, 0xde, 0xe3, 0x28,

-	0xbb, 0x8c, 0x42, 0xe1, 0xd3, 0x79, 0x74, 0x0a, 0xbc, 0x89, 0xb8, 0x53, 0x70, 0x42, 0x18, 0x3b,

-	0x45, 0xc8, 0x10, 0x01, 0xb3, 0x3e, 0x81, 0xca, 0xb6, 0x47, 0x99, 0x2b, 0x78, 0x1b, 0x92, 0x23,

-	0x1b, 0x58, 0xc6, 0x82, 0x20, 0xd7, 0x75, 0x6a, 0x50, 0x22, 0x51, 0xc9, 0xbb, 0x30, 0xaf, 0x28,

-	0x43, 0xaf, 0x6e, 0x41, 0x01, 0x6f, 0x18, 0x15, 0x5e, 0x33, 0x28, 0xb4, 0x25, 0xd6, 0xfa, 0x10,

-	0xe6, 0x58, 0x39, 0x29, 0x9e, 0xad, 0x01, 0xc4, 0x09, 0xc5, 0x82, 0x28, 0xb3, 0x0c, 0x15, 0xa3,

-	0x7c, 0xda, 0xc5, 0x28, 0x9d, 0x2c, 0x3e, 0x92, 0x54, 0x31, 0x99, 0x3f, 0x3f, 0xe5, 0xa0, 0x22,

-	0x5a, 0xd5, 0x24, 0x3e, 0x31, 0xe6, 0xcc, 0x4a, 0xf4, 0x18, 0x5d, 0x76, 0x06, 0x65, 0x64, 0xa3,

-	0xdd, 0x18, 0x68, 0xb4, 0xa3, 0x67, 0x48, 0x09, 0x60, 0xb2, 0x1b, 0xd9, 0x81, 0x8a, 0xe8, 0x3a,

-	0x13, 0x25, 0xe9, 0x65, 0x98, 0x57, 0xb4, 0x60, 0xfb, 0xfa, 0x39, 0x0f, 0x57, 0x39, 0xc7, 0xf1,

-	0x3c, 0xea, 0x60, 0x0d, 0xb5, 0x83, 0xad, 0xa7, 0xf5, 0x09, 0x45, 0x72, 0xb8, 0x89, 0x3d, 0xc9,

-	0x9d, 0x7b, 0x13, 0xdb, 0x53, 0x9a, 0xd8, 0x7b, 0x63, 0x3a, 0xa7, 0xeb, 0x63, 0x93, 0x34, 0x8a,

-	0x4f, 0xa1, 0x32, 0x68, 0x0d, 0x73, 0xfe, 0x36, 0x5c, 0xc2, 0x1c, 0xc8, 0x76, 0x61, 0x4c, 0x7a,

-	0x04, 0x8e, 0x9b, 0xc6, 0x2e, 0x0d, 0x1e, 0xba, 0xde, 0xd1, 0x18, 0x4d, 0x03, 0x25, 0x74, 0x4d,

-	0x23, 0x52, 0x16, 0x53, 0xb2, 0x27, 0x8e, 0x4c, 0x94, 0x94, 0x52, 0x12, 0x6b, 0xdd, 0x0f, 0x9b,

-	0x86, 0xe2, 0x19, 0x61, 0xd3, 0x04, 0x4b, 0x26, 0xde, 0x57, 0xf8, 0x9d, 0x73, 0x14, 0x65, 0x38,

-	0x47, 0xf3, 0x31, 0x47, 0x51, 0x96, 0x73, 0x14, 0x01, 0x51, 0x23, 0x39, 0x27, 0x1f, 0xbf, 0x90,

-	0x65, 0x73, 0xee, 0x6e, 0x46, 0xa5, 0xa4, 0x78, 0x1a, 0x95, 0x12, 0x9e, 0x9f, 0xa1, 0x94, 0x14,

-	0xc9, 0x17, 0xab, 0x94, 0x52, 0x9c, 0x7b, 0x4e, 0xa5, 0x14, 0x5b, 0x8b, 0x4b, 0x09, 0x73, 0x60,

-	0x2c, 0x25, 0x99, 0x94, 0x08, 0x1c, 0xe7, 0xeb, 0x6e, 0xb3, 0xd7, 0x3c, 0xa4, 0x5e, 0x94, 0x2f,

-	0xf1, 0xb7, 0x6f, 0xbb, 0x73, 0xec, 0x07, 0xfc, 0x34, 0x6a, 0xab, 0x2d, 0x71, 0xa2, 0xb4, 0x55,

-	0xc4, 0x71, 0x2e, 0x20, 0x20, 0xa2, 0x6c, 0xa4, 0x22, 0xa6, 0x2c, 0x42, 0x4c, 0x94, 0x95, 0x52,

-	0x12, 0x1b, 0xf1, 0x07, 0x5f, 0x9c, 0x81, 0x3f, 0x8a, 0xe4, 0x8b, 0xc5, 0x9f, 0x14, 0xe7, 0x9e,

-	0x13, 0x7f, 0x62, 0x6b, 0x31, 0x7f, 0xf0, 0xa2, 0x8d, 0xfc, 0x91, 0x59, 0x89, 0xc0, 0x89, 0x91,

-	0x64, 0x12, 0xaa, 0xf0, 0x91, 0x44, 0xa2, 0xc7, 0x19, 0x49, 0x50, 0x66, 0x8c, 0x91, 0x04, 0xad,

-	0xeb, 0x46, 0x92, 0xf3, 0x21, 0x6a, 0xfd, 0xb7, 0x39, 0x28, 0x6c, 0x8b, 0x9f, 0x7b, 0x88, 0x03,

-	0x05, 0xfc, 0x25, 0x85, 0x58, 0x3a, 0xe1, 0xc1, 0x5f, 0x67, 0xaa, 0x37, 0x8c, 0x18, 0x2c, 0xcc,

-	0xf9, 0x5f, 0x7e, 0xf8, 0xfb, 0xbb, 0xfc, 0x2c, 0x94, 0x43, 0xd0, 0x1b, 0x5d, 0x51, 0xb7, 0xc4,

-	0x85, 0x62, 0xb4, 0xb7, 0x93, 0xd7, 0x46, 0xf9, 0x01, 0xa3, 0xfa, 0x7a, 0x06, 0xca, 0x6c, 0xd0,

-	0x03, 0x88, 0xd7, 0x66, 0xa2, 0xd5, 0x35, 0xf4, 0x13, 0x40, 0x75, 0x39, 0x0b, 0x96, 0x69, 0x33,

-	0x5e, 0x96, 0xf5, 0x36, 0x87, 0xd6, 0x70, 0xbd, 0x4d, 0xcd, 0xce, 0x9d, 0x62, 0x53, 0xe4, 0x90,

-	0xef, 0x2c, 0xa9, 0x39, 0x4c, 0x2c, 0xcb, 0xa9, 0x39, 0x1c, 0x58, 0x8b, 0xcd, 0x39, 0x0c, 0x37,

-	0xaa, 0xf4, 0x1c, 0x26, 0x57, 0xcf, 0xf4, 0x1c, 0x0e, 0xac, 0x65, 0x99, 0xf7, 0x19, 0x86, 0x67,

-	0xb8, 0xcf, 0x64, 0x84, 0xcb, 0x59, 0xb0, 0x4c, 0x9b, 0xf1, 0x46, 0xa4, 0xb7, 0x39, 0xb4, 0x74,

-	0xe9, 0x6d, 0x0e, 0x2f, 0x56, 0x69, 0x36, 0x1f, 0xc1, 0xe5, 0xe4, 0x04, 0x4a, 0x6e, 0x8e, 0x38,

-	0x11, 0x57, 0x57, 0xb2, 0x81, 0x66, 0xcb, 0xdf, 0x40, 0x79, 0x60, 0x25, 0x25, 0x5a, 0x8d, 0xba,

-	0x15, 0xb8, 0xba, 0x3a, 0x02, 0x32, 0xd3, 0xf8, 0xc0, 0xb6, 0xa5, 0x37, 0xae, 0xdb, 0x28, 0xf5,

-	0xc6, 0xb5, 0xab, 0x9b, 0xc1, 0xf8, 0xc0, 0x52, 0xa5, 0x37, 0xae, 0xdb, 0xde, 0xf4, 0xc6, 0xf5,

-	0x1b, 0x9a, 0x91, 0x64, 0x38, 0xee, 0xa4, 0x92, 0x6c, 0x70, 0xfa, 0x4d, 0x25, 0x99, 0x3a, 0xca,

-	0x9a, 0x49, 0x26, 0x67, 0xb3, 0x74, 0x92, 0x29, 0xb3, 0x62, 0x3a, 0xc9, 0xd4, 0x31, 0x2f, 0x93,

-	0x64, 0x32, 0x60, 0x03, 0xc9, 0x94, 0x98, 0x57, 0x47, 0x40, 0x8e, 0x98, 0x67, 0xa3, 0x71, 0xdd,

-	0xba, 0x61, 0xca, 0xf3, 0x88, 0xc6, 0x45, 0x9e, 0xf1, 0x6f, 0x70, 0x6a, 0x9e, 0x07, 0x47, 0x93,

-	0xd4, 0x3c, 0x2b, 0x03, 0x40, 0x46, 0x9e, 0xe5, 0x0c, 0x95, 0x9e, 0x67, 0x65, 0xa6, 0x4b, 0xcf,

-	0xb3, 0x3a, 0x8e, 0x65, 0xd6, 0xb3, 0x0c, 0xd8, 0x50, 0xcf, 0x4a, 0xcc, 0xab, 0x23, 0x20, 0x8d,

-	0xc6, 0xb7, 0x16, 0x1f, 0x3f, 0x5d, 0x7a, 0xe9, 0x77, 0xf6, 0xf9, 0xe7, 0xe9, 0x52, 0xee, 0xdb,

-	0x67, 0x4b, 0xb9, 0xc7, 0xec, 0xf3, 0x2b, 0xfb, 0x3c, 0x61, 0x9f, 0x83, 0xe9, 0xf0, 0x7f, 0x9c,

-	0x36, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x43, 0x84, 0x5f, 0x00, 0xea, 0x1a, 0x00, 0x00,

+	// 1384 bytes of a gzipped FileDescriptorProto

+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x59, 0xcf, 0x6f, 0x1b, 0xc5,

+	0x17, 0xff, 0xda, 0x69, 0xe2, 0xfa, 0xb9, 0x4e, 0x9a, 0xa9, 0xa3, 0x6f, 0xe4, 0x86, 0x14, 0x6d,

+	0x21, 0x4d, 0xa4, 0xe0, 0x80, 0xa3, 0x8a, 0x00, 0x12, 0x88, 0x24, 0x14, 0x59, 0x94, 0x50, 0x6d,

+	0x28, 0xe2, 0x16, 0x39, 0xf6, 0x34, 0x2c, 0xb1, 0xbd, 0x66, 0x77, 0x93, 0x36, 0xe2, 0xc2, 0x9f,

+	0xc1, 0xdf, 0xc0, 0x81, 0x3b, 0x27, 0x0e, 0x5c, 0x2a, 0x4e, 0x5c, 0x90, 0x40, 0x42, 0xa8, 0xed,

+	0x1f, 0x80, 0xf8, 0x03, 0x38, 0x30, 0xb3, 0xf3, 0x66, 0x77, 0x3d, 0x9e, 0x9d, 0xb5, 0xe3, 0x54,

+	0xf4, 0x60, 0xd5, 0x3b, 0xfb, 0x79, 0xbf, 0xe6, 0x7d, 0xde, 0xcb, 0x7b, 0x2e, 0x94, 0x5b, 0x6e,

+	0x2f, 0xf0, 0xdc, 0x4e, 0xad, 0xef, 0xb9, 0x81, 0x4b, 0x48, 0xdb, 0x6d, 0x1d, 0x53, 0xaf, 0xe6,

+	0x3f, 0x6c, 0x7a, 0xdd, 0x63, 0x27, 0xa8, 0x9d, 0xbe, 0x51, 0x2d, 0xf9, 0x7d, 0xda, 0xf2, 0x05,

+	0xa0, 0x5a, 0x76, 0x0f, 0xbf, 0xa4, 0xad, 0x40, 0x3e, 0x96, 0x82, 0xb3, 0x3e, 0x95, 0x0f, 0x95,

+	0x23, 0xf7, 0xc8, 0x0d, 0xbf, 0x6e, 0xf0, 0x6f, 0x78, 0x7a, 0xad, 0xdf, 0x39, 0x39, 0x72, 0x7a,

+	0x1b, 0xe2, 0x1f, 0x71, 0x68, 0xdd, 0x86, 0xd9, 0x0f, 0x69, 0xb0, 0xe7, 0xb6, 0xa9, 0x4d, 0xbf,

+	0x3a, 0xa1, 0x7e, 0x40, 0x6e, 0x42, 0xa1, 0xc7, 0x1e, 0x0f, 0x9c, 0xf6, 0x62, 0xee, 0xe5, 0xdc,

+	0x6a, 0x71, 0x1b, 0x9e, 0xfd, 0x79, 0x63, 0x86, 0x23, 0x1a, 0xbb, 0xf6, 0x0c, 0x7f, 0xd5, 0x68,

+	0x5b, 0xef, 0xc1, 0x5c, 0x24, 0xe6, 0xf7, 0xdd, 0x9e, 0x4f, 0xc9, 0x3a, 0x5c, 0xe2, 0x2f, 0x43,

+	0xa1, 0x52, 0x7d, 0xb1, 0x36, 0x1c, 0x40, 0x2d, 0xc4, 0x87, 0x28, 0xeb, 0x87, 0x29, 0xb8, 0x7a,

+	0xd7, 0xf1, 0x43, 0x15, 0xbe, 0x34, 0x7d, 0x07, 0x0a, 0x0f, 0x9c, 0x4e, 0x40, 0x3d, 0x1f, 0xb5,

+	0xac, 0xeb, 0xb4, 0xa8, 0x62, 0xb5, 0x3b, 0x42, 0xc6, 0x96, 0xc2, 0xd5, 0x3f, 0xf2, 0x50, 0xc0,

+	0x43, 0x52, 0x81, 0xe9, 0x5e, 0xb3, 0x4b, 0xb9, 0xc6, 0xa9, 0xd5, 0xa2, 0x2d, 0x1e, 0xc8, 0x06,

+	0x94, 0x9c, 0xf6, 0x41, 0xdf, 0xa3, 0x0f, 0x9c, 0x47, 0xec, 0x5d, 0x9e, 0xbf, 0xdb, 0x9e, 0x65,

+	0x81, 0x42, 0x63, 0xf7, 0x1e, 0x9e, 0xda, 0xe0, 0xb4, 0xe5, 0x77, 0x72, 0x0f, 0x66, 0x3a, 0xcd,

+	0x43, 0xda, 0xf1, 0x17, 0xa7, 0x18, 0xb6, 0x54, 0xdf, 0x1a, 0xc7, 0xb3, 0xda, 0xdd, 0x50, 0xf4,

+	0x03, 0x96, 0xe0, 0x33, 0x1b, 0xf5, 0x90, 0x06, 0x94, 0xba, 0xb4, 0x7b, 0xc8, 0x5e, 0x7f, 0xe1,

+	0xf4, 0xfd, 0xc5, 0x4b, 0x4c, 0xed, 0x6c, 0xfd, 0x56, 0xda, 0xb5, 0xed, 0xb3, 0xd4, 0xd7, 0x3e,

+	0x8e, 0xf0, 0x76, 0x52, 0x96, 0xd4, 0x61, 0x9a, 0x31, 0x87, 0xc5, 0x31, 0x1d, 0x2a, 0x59, 0x4a,

+	0xbd, 0x7b, 0x06, 0xb2, 0x05, 0xb4, 0xfa, 0x16, 0x94, 0x12, 0x5e, 0x91, 0xab, 0x30, 0x75, 0x4c,

+	0xcf, 0x44, 0xc6, 0x6d, 0xfe, 0x95, 0x5f, 0xdc, 0x69, 0xb3, 0x73, 0x42, 0xd9, 0xe5, 0xf0, 0x33,

+	0xf1, 0xf0, 0x76, 0x7e, 0x2b, 0x67, 0xed, 0xc0, 0x7c, 0x22, 0x52, 0x4c, 0x7f, 0x8d, 0xdd, 0x33,

+	0x3f, 0x08, 0xef, 0xd9, 0x94, 0x7f, 0x01, 0xb3, 0xbe, 0xcb, 0xc1, 0xfc, 0xfd, 0x7e, 0xbb, 0x19,

+	0xd0, 0x71, 0xc9, 0x47, 0xde, 0x85, 0x2b, 0x21, 0xe8, 0x94, 0xc5, 0xef, 0xb8, 0xbd, 0xd0, 0xc1,

+	0x52, 0xfd, 0xba, 0xce, 0xe2, 0x67, 0x02, 0x62, 0x97, 0xb8, 0x00, 0x3e, 0x90, 0xd7, 0xe1, 0x12,

+	0xaf, 0x24, 0x96, 0x49, 0x2e, 0xb7, 0x64, 0xba, 0x72, 0x3b, 0x44, 0x5a, 0xdb, 0x40, 0x92, 0xbe,

+	0x9e, 0x8b, 0xf1, 0x5b, 0x30, 0x6f, 0xd3, 0xae, 0x7b, 0x3a, 0x76, 0xbc, 0x56, 0x05, 0x48, 0x52,

+	0x52, 0x58, 0xc7, 0xca, 0xfd, 0xb4, 0xe9, 0x1f, 0x27, 0x94, 0x05, 0xec, 0x51, 0x51, 0xc6, 0x11,

+	0x5c, 0x19, 0x7f, 0x15, 0x55, 0xae, 0x10, 0x8b, 0xe3, 0xe0, 0x2f, 0x4d, 0x71, 0x84, 0xf8, 0x10,

+	0x15, 0xc7, 0x31, 0xb6, 0xe9, 0x28, 0x8e, 0xa4, 0x75, 0xeb, 0x77, 0xec, 0x04, 0xfc, 0xf0, 0x1c,

+	0x9d, 0x20, 0x29, 0x36, 0xdc, 0x09, 0xfe, 0xf9, 0x0f, 0x3b, 0x81, 0xce, 0x33, 0x6d, 0x27, 0x60,

+	0x2e, 0xf8, 0xd4, 0x3b, 0x75, 0x5a, 0x9c, 0x07, 0xa2, 0x13, 0xa0, 0x0b, 0xfb, 0xe2, 0xb8, 0xb1,

+	0xcb, 0x5c, 0x40, 0x48, 0xa3, 0xed, 0x93, 0x15, 0xb8, 0x8c, 0xac, 0x11, 0x25, 0x5f, 0xdc, 0x2e,

+	0x31, 0x74, 0x41, 0xd0, 0x86, 0x45, 0x2f, 0x78, 0xe3, 0x93, 0x5d, 0x98, 0x65, 0xa5, 0xe6, 0x78,

+	0xb4, 0x7d, 0xe0, 0x07, 0x8c, 0xbd, 0xfe, 0xe2, 0x4c, 0xd8, 0x20, 0x5e, 0x4a, 0x4b, 0xf1, 0x3e,

+	0x47, 0xd9, 0x65, 0x14, 0x0a, 0x9f, 0x2e, 0xa2, 0x53, 0xe0, 0x4d, 0xc4, 0x9d, 0x82, 0x13, 0xc2,

+	0xd8, 0x29, 0x42, 0x86, 0x08, 0x98, 0xf5, 0x11, 0x54, 0x76, 0x3c, 0xca, 0x5c, 0xc1, 0xdb, 0x90,

+	0x1c, 0xd9, 0xc4, 0x32, 0x16, 0x04, 0xb9, 0xa1, 0x53, 0x83, 0x12, 0x89, 0x4a, 0xde, 0x83, 0x05,

+	0x45, 0x19, 0x7a, 0x75, 0x1b, 0x0a, 0x78, 0xc3, 0xa8, 0xf0, 0xba, 0x41, 0xa1, 0x2d, 0xb1, 0xd6,

+	0xfb, 0x30, 0xcf, 0xca, 0x49, 0xf1, 0x6c, 0x1d, 0x20, 0x4e, 0x28, 0x16, 0x44, 0x99, 0x65, 0xa8,

+	0x18, 0xe5, 0xd3, 0x2e, 0x46, 0xe9, 0x64, 0xf1, 0x91, 0xa4, 0x8a, 0xc9, 0xfc, 0xf9, 0x31, 0x07,

+	0x15, 0xd1, 0xaa, 0x26, 0xf1, 0x89, 0x31, 0x67, 0x4e, 0xa2, 0xc7, 0xe8, 0xb2, 0xb3, 0x28, 0x23,

+	0x1b, 0xed, 0xe6, 0x40, 0xa3, 0x1d, 0x3d, 0x43, 0x4a, 0x00, 0x93, 0xdd, 0xc8, 0x2e, 0x54, 0x44,

+	0xd7, 0x99, 0x28, 0x49, 0xff, 0x87, 0x05, 0x45, 0x0b, 0xb6, 0xaf, 0x9f, 0xf2, 0x70, 0x8d, 0x73,

+	0x1c, 0xcf, 0xa3, 0x0e, 0xd6, 0x50, 0x3b, 0xd8, 0x46, 0x5a, 0x9f, 0x50, 0x24, 0x87, 0x9b, 0xd8,

+	0x93, 0xdc, 0x85, 0x37, 0xb1, 0x7d, 0xa5, 0x89, 0xbd, 0x33, 0xa6, 0x73, 0xba, 0x3e, 0x36, 0x49,

+	0xa3, 0xf8, 0x04, 0x2a, 0x83, 0xd6, 0x30, 0xe7, 0x6f, 0xc2, 0x65, 0xcc, 0x81, 0x6c, 0x17, 0xc6,

+	0xa4, 0x47, 0xe0, 0xb8, 0x69, 0xec, 0xd1, 0xe0, 0xa1, 0xeb, 0x1d, 0x8f, 0xd1, 0x34, 0x50, 0x42,

+	0xd7, 0x34, 0x22, 0x65, 0x31, 0x25, 0x7b, 0xe2, 0xc8, 0x44, 0x49, 0x29, 0x25, 0xb1, 0xd6, 0xfd,

+	0xb0, 0x69, 0x28, 0x9e, 0x11, 0x36, 0x4d, 0xb0, 0x64, 0xe2, 0x7d, 0x85, 0xdf, 0x39, 0x47, 0x51,

+	0x86, 0x73, 0x34, 0x1f, 0x73, 0x14, 0x65, 0x39, 0x47, 0x11, 0x10, 0x35, 0x92, 0x0b, 0xf2, 0xf1,

+	0x73, 0x59, 0x36, 0x17, 0xee, 0x66, 0x54, 0x4a, 0x8a, 0xa7, 0x51, 0x29, 0xe1, 0xf9, 0x39, 0x4a,

+	0x49, 0x91, 0x7c, 0xb1, 0x4a, 0x29, 0xc5, 0xb9, 0xe7, 0x54, 0x4a, 0xb1, 0xb5, 0xb8, 0x94, 0x30,

+	0x07, 0xc6, 0x52, 0x92, 0x49, 0x89, 0xc0, 0xf8, 0x27, 0x6e, 0xa7, 0x73, 0xe2, 0x33, 0x77, 0x13,

+	0xdd, 0xb3, 0x25, 0x4e, 0x94, 0xee, 0x89, 0x38, 0x9e, 0x72, 0x04, 0x44, 0xcc, 0x8c, 0x54, 0xc4,

+	0xcc, 0x44, 0x88, 0x89, 0x99, 0x52, 0x4a, 0x62, 0x23, 0x9a, 0xe0, 0x8b, 0x73, 0xd0, 0x44, 0x91,

+	0x7c, 0xb1, 0x68, 0x92, 0xe2, 0xdc, 0x73, 0xa2, 0x49, 0x6c, 0x2d, 0xa6, 0x09, 0x5e, 0xb4, 0x91,

+	0x26, 0x32, 0x2b, 0x11, 0x38, 0x31, 0x79, 0x4c, 0x42, 0x15, 0x3e, 0x79, 0x48, 0xf4, 0x38, 0x93,

+	0x07, 0xca, 0x8c, 0x31, 0x79, 0xa0, 0x75, 0xdd, 0xe4, 0x71, 0x31, 0x44, 0xad, 0xff, 0x3a, 0x0f,

+	0x85, 0x1d, 0xf1, 0xab, 0x0e, 0x71, 0xa0, 0x80, 0x3f, 0x98, 0x10, 0x4b, 0x27, 0x3c, 0xf8, 0x23,

+	0x4c, 0xf5, 0xa6, 0x11, 0x83, 0xfd, 0x72, 0xe1, 0xe7, 0xef, 0xff, 0xfa, 0x36, 0x3f, 0x07, 0xe5,

+	0x10, 0xf4, 0x5a, 0xb7, 0xd9, 0x6b, 0x1e, 0x51, 0x8f, 0xb8, 0x50, 0x8c, 0xd6, 0x73, 0xf2, 0xca,

+	0x28, 0xbf, 0x53, 0x54, 0x5f, 0xcd, 0x40, 0x99, 0x0d, 0x7a, 0x00, 0xf1, 0x76, 0x4c, 0xb4, 0xba,

+	0x86, 0x36, 0xfd, 0xea, 0x4a, 0x16, 0x2c, 0xd3, 0x66, 0xbc, 0x13, 0xeb, 0x6d, 0x0e, 0x6d, 0xdb,

+	0x7a, 0x9b, 0x9a, 0xd5, 0x3a, 0xc5, 0xa6, 0xc8, 0x21, 0x5f, 0x4d, 0x52, 0x73, 0x98, 0xd8, 0x89,

+	0x53, 0x73, 0x38, 0xb0, 0xfd, 0x9a, 0x73, 0x18, 0x2e, 0x4e, 0xe9, 0x39, 0x4c, 0x6e, 0x98, 0xe9,

+	0x39, 0x1c, 0xd8, 0xbe, 0x32, 0xef, 0x33, 0x0c, 0xcf, 0x70, 0x9f, 0xc9, 0x08, 0x57, 0xb2, 0x60,

+	0x99, 0x36, 0xe3, 0xc5, 0x47, 0x6f, 0x73, 0x68, 0xb7, 0xd2, 0xdb, 0x1c, 0xde, 0x9f, 0xd2, 0x6c,

+	0x3e, 0x82, 0x2b, 0xc9, 0x41, 0x93, 0xdc, 0x1a, 0x71, 0xf0, 0xad, 0xae, 0x66, 0x03, 0xcd, 0x96,

+	0xbf, 0x86, 0xf2, 0xc0, 0xe6, 0x49, 0xb4, 0x1a, 0x75, 0x9b, 0x6e, 0x75, 0x6d, 0x04, 0x64, 0xa6,

+	0xf1, 0x81, 0xa5, 0x4a, 0x6f, 0x5c, 0xb7, 0x38, 0xea, 0x8d, 0x6b, 0x37, 0x34, 0x83, 0xf1, 0x81,

+	0xdd, 0x49, 0x6f, 0x5c, 0xb7, 0xa4, 0xe9, 0x8d, 0xeb, 0x17, 0x31, 0x23, 0xc9, 0x70, 0xaa, 0x49,

+	0x25, 0xd9, 0xe0, 0x90, 0x9b, 0x4a, 0x32, 0x75, 0x62, 0x35, 0x93, 0x4c, 0x8e, 0x60, 0xe9, 0x24,

+	0x53, 0x46, 0xc2, 0x74, 0x92, 0xa9, 0xd3, 0x5c, 0x26, 0xc9, 0x64, 0xc0, 0x06, 0x92, 0x29, 0x31,

+	0xaf, 0x8d, 0x80, 0x1c, 0x31, 0xcf, 0x46, 0xe3, 0xba, 0xad, 0xc2, 0x94, 0xe7, 0x11, 0x8d, 0x8b,

+	0x3c, 0xe3, 0xdf, 0xe0, 0xd4, 0x3c, 0x0f, 0x8e, 0x26, 0xa9, 0x79, 0x56, 0x06, 0x80, 0x8c, 0x3c,

+	0xcb, 0x19, 0x2a, 0x3d, 0xcf, 0xca, 0x4c, 0x97, 0x9e, 0x67, 0x75, 0x1c, 0xcb, 0xac, 0x67, 0x19,

+	0xb0, 0xa1, 0x9e, 0x95, 0x98, 0xd7, 0x46, 0x40, 0x1a, 0x8d, 0x6f, 0x2f, 0x3d, 0x7e, 0xba, 0xfc,

+	0xbf, 0xdf, 0xd8, 0xe7, 0xef, 0xa7, 0xcb, 0xb9, 0x6f, 0x9e, 0x2d, 0xe7, 0x1e, 0xb3, 0xcf, 0x2f,

+	0xec, 0xf3, 0x84, 0x7d, 0x0e, 0x67, 0xc2, 0xff, 0x58, 0xda, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff,

+	0x35, 0x0f, 0xc7, 0x5a, 0xd1, 0x1a, 0x00, 0x00,

 }

@@ -235,8 +235,6 @@ message ListNetworksResponse {

 	repeated Network networks = 1;

 }

-message RemoveManagerResponse {}

-

 message GetClusterRequest {

 	string cluster_id = 1 [(gogoproto.customname) = "ClusterID"];

 }

@@ -49,8 +49,8 @@ type Node struct {

 	Description *NodeDescription `protobuf:"bytes,4,opt,name=description" json:"description,omitempty"`

 	// Status provides the current status of the node, as seen by the manager.

 	Status NodeStatus `protobuf:"bytes,5,opt,name=status" json:"status"`

-	// Status of the manager. If the node is not a manager, this field will not

-	// be set.

+	// ManagerStatus provides the current status of the node's manager

+	// component, if the node is a manager.

 	ManagerStatus *ManagerStatus `protobuf:"bytes,6,opt,name=manager_status,json=managerStatus" json:"manager_status,omitempty"`

 	// The node attachment to the ingress network.

 	Attachment *NetworkAttachment `protobuf:"bytes,7,opt,name=attachment" json:"attachment,omitempty"`

@@ -39,8 +39,8 @@ message Node {

 	// Status provides the current status of the node, as seen by the manager.

 	NodeStatus status = 5 [(gogoproto.nullable) = false];

-	// Status of the manager. If the node is not a manager, this field will not

-	// be set.

+	// ManagerStatus provides the current status of the node's manager

+	// component, if the node is a manager.

 	ManagerStatus manager_status = 6;

 	// The node attachment to the ingress network.

@@ -64,6 +64,22 @@ func (x StoreActionKind) String() string {

 }

 func (StoreActionKind) EnumDescriptor() ([]byte, []int) { return fileDescriptorRaft, []int{0} }

+type RaftMember struct {

+	// RaftID specifies the internal ID used by the manager in a raft context, it can never be modified

+	// and is used only for information purposes

+	RaftID uint64 `protobuf:"varint,1,opt,name=raft_id,json=raftId,proto3" json:"raft_id,omitempty"`

+	// NodeID is the node's ID.

+	NodeID string `protobuf:"bytes,2,opt,name=node_id,json=nodeId,proto3" json:"node_id,omitempty"`

+	// Addr specifies the address of the member

+	Addr string `protobuf:"bytes,3,opt,name=addr,proto3" json:"addr,omitempty"`

+	// Status provides the current status of the manager from the perspective of another manager.

+	Status RaftMemberStatus `protobuf:"bytes,4,opt,name=status" json:"status"`

+}

+

+func (m *RaftMember) Reset()                    { *m = RaftMember{} }

+func (*RaftMember) ProtoMessage()               {}

+func (*RaftMember) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{0} }

+

 type JoinRequest struct {

 	// Addr specifies the address of the member

 	Addr string `protobuf:"bytes,1,opt,name=addr,proto3" json:"addr,omitempty"`

@@ -71,15 +87,16 @@ type JoinRequest struct {

 func (m *JoinRequest) Reset()                    { *m = JoinRequest{} }

 func (*JoinRequest) ProtoMessage()               {}

-func (*JoinRequest) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{0} }

+func (*JoinRequest) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{1} }

 type JoinResponse struct {

-	Members []*RaftMember `protobuf:"bytes,1,rep,name=members" json:"members,omitempty"`

+	RaftID  uint64        `protobuf:"varint,1,opt,name=raft_id,json=raftId,proto3" json:"raft_id,omitempty"`

+	Members []*RaftMember `protobuf:"bytes,2,rep,name=members" json:"members,omitempty"`

 }

 func (m *JoinResponse) Reset()                    { *m = JoinResponse{} }

 func (*JoinResponse) ProtoMessage()               {}

-func (*JoinResponse) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{1} }

+func (*JoinResponse) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{2} }

 type LeaveRequest struct {

 	Node *RaftMember `protobuf:"bytes,1,opt,name=node" json:"node,omitempty"`

@@ -87,14 +104,14 @@ type LeaveRequest struct {

 func (m *LeaveRequest) Reset()                    { *m = LeaveRequest{} }

 func (*LeaveRequest) ProtoMessage()               {}

-func (*LeaveRequest) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{2} }

+func (*LeaveRequest) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{3} }

 type LeaveResponse struct {

 }

 func (m *LeaveResponse) Reset()                    { *m = LeaveResponse{} }

 func (*LeaveResponse) ProtoMessage()               {}

-func (*LeaveResponse) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{3} }

+func (*LeaveResponse) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{4} }

 type ProcessRaftMessageRequest struct {

 	Message *raftpb.Message `protobuf:"bytes,1,opt,name=message" json:"message,omitempty"`

@@ -102,14 +119,14 @@ type ProcessRaftMessageRequest struct {

 func (m *ProcessRaftMessageRequest) Reset()                    { *m = ProcessRaftMessageRequest{} }

 func (*ProcessRaftMessageRequest) ProtoMessage()               {}

-func (*ProcessRaftMessageRequest) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{4} }

+func (*ProcessRaftMessageRequest) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{5} }

 type ProcessRaftMessageResponse struct {

 }

 func (m *ProcessRaftMessageResponse) Reset()                    { *m = ProcessRaftMessageResponse{} }

 func (*ProcessRaftMessageResponse) ProtoMessage()               {}

-func (*ProcessRaftMessageResponse) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{5} }

+func (*ProcessRaftMessageResponse) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{6} }

 type ResolveAddressRequest struct {

 	// raft_id is the ID to resolve to an address.

@@ -118,7 +135,7 @@ type ResolveAddressRequest struct {

 func (m *ResolveAddressRequest) Reset()                    { *m = ResolveAddressRequest{} }

 func (*ResolveAddressRequest) ProtoMessage()               {}

-func (*ResolveAddressRequest) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{6} }

+func (*ResolveAddressRequest) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{7} }

 type ResolveAddressResponse struct {

 	// Addr specifies the address of the member

@@ -127,7 +144,7 @@ type ResolveAddressResponse struct {

 func (m *ResolveAddressResponse) Reset()                    { *m = ResolveAddressResponse{} }

 func (*ResolveAddressResponse) ProtoMessage()               {}

-func (*ResolveAddressResponse) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{7} }

+func (*ResolveAddressResponse) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{8} }

 // Contains one of many protobuf encoded objects to replicate

 // over the raft backend with a request ID to track when the

@@ -139,7 +156,7 @@ type InternalRaftRequest struct {

 func (m *InternalRaftRequest) Reset()                    { *m = InternalRaftRequest{} }

 func (*InternalRaftRequest) ProtoMessage()               {}

-func (*InternalRaftRequest) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{8} }

+func (*InternalRaftRequest) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{9} }

 // StoreAction defines a taret and operation to apply on the storage system.

 type StoreAction struct {

@@ -155,7 +172,7 @@ type StoreAction struct {

 func (m *StoreAction) Reset()                    { *m = StoreAction{} }

 func (*StoreAction) ProtoMessage()               {}

-func (*StoreAction) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{9} }

+func (*StoreAction) Descriptor() ([]byte, []int) { return fileDescriptorRaft, []int{10} }

 type isStoreAction_Target interface {

 	isStoreAction_Target()

@@ -359,6 +376,7 @@ func _StoreAction_OneofSizer(msg proto.Message) (n int) {

 }

 func init() {

+	proto.RegisterType((*RaftMember)(nil), "docker.swarmkit.v1.RaftMember")

 	proto.RegisterType((*JoinRequest)(nil), "docker.swarmkit.v1.JoinRequest")

 	proto.RegisterType((*JoinResponse)(nil), "docker.swarmkit.v1.JoinResponse")

 	proto.RegisterType((*LeaveRequest)(nil), "docker.swarmkit.v1.LeaveRequest")

@@ -384,36 +402,63 @@ func NewAuthenticatedWrapperRaftServer(local RaftServer, authorize func(context.

 	}

 }

-func (p *authenticatedWrapperRaftServer) Join(ctx context.Context, r *JoinRequest) (*JoinResponse, error) {

+func (p *authenticatedWrapperRaftServer) ProcessRaftMessage(ctx context.Context, r *ProcessRaftMessageRequest) (*ProcessRaftMessageResponse, error) {

 	if err := p.authorize(ctx, []string{"swarm-manager"}); err != nil {

 		return nil, err

 	}

-	return p.local.Join(ctx, r)

+	return p.local.ProcessRaftMessage(ctx, r)

 }

-func (p *authenticatedWrapperRaftServer) Leave(ctx context.Context, r *LeaveRequest) (*LeaveResponse, error) {

+func (p *authenticatedWrapperRaftServer) ResolveAddress(ctx context.Context, r *ResolveAddressRequest) (*ResolveAddressResponse, error) {

 	if err := p.authorize(ctx, []string{"swarm-manager"}); err != nil {

 		return nil, err

 	}

-	return p.local.Leave(ctx, r)

+	return p.local.ResolveAddress(ctx, r)

 }

-func (p *authenticatedWrapperRaftServer) ProcessRaftMessage(ctx context.Context, r *ProcessRaftMessageRequest) (*ProcessRaftMessageResponse, error) {

+type authenticatedWrapperRaftMembershipServer struct {

+	local     RaftMembershipServer

+	authorize func(context.Context, []string) error

+}

+

+func NewAuthenticatedWrapperRaftMembershipServer(local RaftMembershipServer, authorize func(context.Context, []string) error) RaftMembershipServer {

+	return &authenticatedWrapperRaftMembershipServer{

+		local:     local,

+		authorize: authorize,

+	}

+}

+

+func (p *authenticatedWrapperRaftMembershipServer) Join(ctx context.Context, r *JoinRequest) (*JoinResponse, error) {

 	if err := p.authorize(ctx, []string{"swarm-manager"}); err != nil {

 		return nil, err

 	}

-	return p.local.ProcessRaftMessage(ctx, r)

+	return p.local.Join(ctx, r)

 }

-func (p *authenticatedWrapperRaftServer) ResolveAddress(ctx context.Context, r *ResolveAddressRequest) (*ResolveAddressResponse, error) {

+func (p *authenticatedWrapperRaftMembershipServer) Leave(ctx context.Context, r *LeaveRequest) (*LeaveResponse, error) {

 	if err := p.authorize(ctx, []string{"swarm-manager"}); err != nil {

 		return nil, err

 	}

-	return p.local.ResolveAddress(ctx, r)

+	return p.local.Leave(ctx, r)

+}

+

+func (m *RaftMember) Copy() *RaftMember {

+	if m == nil {

+		return nil

+	}

+

+	o := &RaftMember{

+		RaftID: m.RaftID,

+		NodeID: m.NodeID,

+		Addr:   m.Addr,

+		Status: *m.Status.Copy(),

+	}

+

+	return o

 }

 func (m *JoinRequest) Copy() *JoinRequest {

@@ -433,7 +478,9 @@ func (m *JoinResponse) Copy() *JoinResponse {

 		return nil

 	}

-	o := &JoinResponse{}

+	o := &JoinResponse{

+		RaftID: m.RaftID,

+	}

 	if m.Members != nil {

 		o.Members = make([]*RaftMember, 0, len(m.Members))

@@ -565,6 +612,19 @@ func (m *StoreAction) Copy() *StoreAction {

 	return o

 }

+func (this *RaftMember) GoString() string {

+	if this == nil {

+		return "nil"

+	}

+	s := make([]string, 0, 8)

+	s = append(s, "&api.RaftMember{")

+	s = append(s, "RaftID: "+fmt.Sprintf("%#v", this.RaftID)+",\n")

+	s = append(s, "NodeID: "+fmt.Sprintf("%#v", this.NodeID)+",\n")

+	s = append(s, "Addr: "+fmt.Sprintf("%#v", this.Addr)+",\n")

+	s = append(s, "Status: "+strings.Replace(this.Status.GoString(), `&`, ``, 1)+",\n")

+	s = append(s, "}")

+	return strings.Join(s, "")

+}

 func (this *JoinRequest) GoString() string {

 	if this == nil {

 		return "nil"

@@ -579,8 +639,9 @@ func (this *JoinResponse) GoString() string {

 	if this == nil {

 		return "nil"

 	}

-	s := make([]string, 0, 5)

+	s := make([]string, 0, 6)

 	s = append(s, "&api.JoinResponse{")

+	s = append(s, "RaftID: "+fmt.Sprintf("%#v", this.RaftID)+",\n")

 	if this.Members != nil {

 		s = append(s, "Members: "+fmt.Sprintf("%#v", this.Members)+",\n")

 	}

@@ -752,10 +813,6 @@ const _ = grpc.SupportPackageIsVersion2

 // Client API for Raft service

 type RaftClient interface {

-	// Join adds a RaftMember to the raft cluster.

-	Join(ctx context.Context, in *JoinRequest, opts ...grpc.CallOption) (*JoinResponse, error)

-	// Leave removes a RaftMember from the raft cluster.

-	Leave(ctx context.Context, in *LeaveRequest, opts ...grpc.CallOption) (*LeaveResponse, error)

 	// ProcessRaftMessage sends a raft message to be processed on a raft member, it is

 	// called from the RaftMember willing to send a message to its destination ('To' field)

 	ProcessRaftMessage(ctx context.Context, in *ProcessRaftMessageRequest, opts ...grpc.CallOption) (*ProcessRaftMessageResponse, error)

@@ -771,24 +828,6 @@ func NewRaftClient(cc *grpc.ClientConn) RaftClient {

 	return &raftClient{cc}

 }

-func (c *raftClient) Join(ctx context.Context, in *JoinRequest, opts ...grpc.CallOption) (*JoinResponse, error) {

-	out := new(JoinResponse)

-	err := grpc.Invoke(ctx, "/docker.swarmkit.v1.Raft/Join", in, out, c.cc, opts...)

-	if err != nil {

-		return nil, err

-	}

-	return out, nil

-}

-

-func (c *raftClient) Leave(ctx context.Context, in *LeaveRequest, opts ...grpc.CallOption) (*LeaveResponse, error) {

-	out := new(LeaveResponse)

-	err := grpc.Invoke(ctx, "/docker.swarmkit.v1.Raft/Leave", in, out, c.cc, opts...)

-	if err != nil {

-		return nil, err

-	}

-	return out, nil

-}

-

 func (c *raftClient) ProcessRaftMessage(ctx context.Context, in *ProcessRaftMessageRequest, opts ...grpc.CallOption) (*ProcessRaftMessageResponse, error) {

 	out := new(ProcessRaftMessageResponse)

 	err := grpc.Invoke(ctx, "/docker.swarmkit.v1.Raft/ProcessRaftMessage", in, out, c.cc, opts...)

@@ -810,10 +849,6 @@ func (c *raftClient) ResolveAddress(ctx context.Context, in *ResolveAddressReque

 // Server API for Raft service

 type RaftServer interface {

-	// Join adds a RaftMember to the raft cluster.

-	Join(context.Context, *JoinRequest) (*JoinResponse, error)

-	// Leave removes a RaftMember from the raft cluster.

-	Leave(context.Context, *LeaveRequest) (*LeaveResponse, error)

 	// ProcessRaftMessage sends a raft message to be processed on a raft member, it is

 	// called from the RaftMember willing to send a message to its destination ('To' field)

 	ProcessRaftMessage(context.Context, *ProcessRaftMessageRequest) (*ProcessRaftMessageResponse, error)

@@ -825,102 +860,201 @@ func RegisterRaftServer(s *grpc.Server, srv RaftServer) {

 	s.RegisterService(&_Raft_serviceDesc, srv)

 }

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

-	in := new(JoinRequest)

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

+	in := new(ProcessRaftMessageRequest)

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

 		return nil, err

 	}

 	if interceptor == nil {

-		return srv.(RaftServer).Join(ctx, in)

+		return srv.(RaftServer).ProcessRaftMessage(ctx, in)

 	}

 	info := &grpc.UnaryServerInfo{

 		Server:     srv,

-		FullMethod: "/docker.swarmkit.v1.Raft/Join",

+		FullMethod: "/docker.swarmkit.v1.Raft/ProcessRaftMessage",

 	}

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

-		return srv.(RaftServer).Join(ctx, req.(*JoinRequest))

+		return srv.(RaftServer).ProcessRaftMessage(ctx, req.(*ProcessRaftMessageRequest))

 	}

 	return interceptor(ctx, in, info, handler)

 }

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

-	in := new(LeaveRequest)

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

+	in := new(ResolveAddressRequest)

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

 		return nil, err

 	}

 	if interceptor == nil {

-		return srv.(RaftServer).Leave(ctx, in)

+		return srv.(RaftServer).ResolveAddress(ctx, in)

 	}

 	info := &grpc.UnaryServerInfo{

 		Server:     srv,

-		FullMethod: "/docker.swarmkit.v1.Raft/Leave",

+		FullMethod: "/docker.swarmkit.v1.Raft/ResolveAddress",

 	}

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

-		return srv.(RaftServer).Leave(ctx, req.(*LeaveRequest))

+		return srv.(RaftServer).ResolveAddress(ctx, req.(*ResolveAddressRequest))

 	}

 	return interceptor(ctx, in, info, handler)

 }

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

-	in := new(ProcessRaftMessageRequest)

+var _Raft_serviceDesc = grpc.ServiceDesc{

+	ServiceName: "docker.swarmkit.v1.Raft",

+	HandlerType: (*RaftServer)(nil),

+	Methods: []grpc.MethodDesc{

+		{

+			MethodName: "ProcessRaftMessage",

+			Handler:    _Raft_ProcessRaftMessage_Handler,

+		},

+		{

+			MethodName: "ResolveAddress",

+			Handler:    _Raft_ResolveAddress_Handler,

+		},

+	},

+	Streams: []grpc.StreamDesc{},

+}

+

+// Client API for RaftMembership service

+

+type RaftMembershipClient interface {

+	// Join adds a RaftMember to the raft cluster.

+	Join(ctx context.Context, in *JoinRequest, opts ...grpc.CallOption) (*JoinResponse, error)

+	// Leave removes a RaftMember from the raft cluster.

+	Leave(ctx context.Context, in *LeaveRequest, opts ...grpc.CallOption) (*LeaveResponse, error)

+}

+

+type raftMembershipClient struct {

+	cc *grpc.ClientConn

+}

+

+func NewRaftMembershipClient(cc *grpc.ClientConn) RaftMembershipClient {

+	return &raftMembershipClient{cc}

+}

+

+func (c *raftMembershipClient) Join(ctx context.Context, in *JoinRequest, opts ...grpc.CallOption) (*JoinResponse, error) {

+	out := new(JoinResponse)

+	err := grpc.Invoke(ctx, "/docker.swarmkit.v1.RaftMembership/Join", in, out, c.cc, opts...)

+	if err != nil {

+		return nil, err

+	}

+	return out, nil

+}

+

+func (c *raftMembershipClient) Leave(ctx context.Context, in *LeaveRequest, opts ...grpc.CallOption) (*LeaveResponse, error) {

+	out := new(LeaveResponse)

+	err := grpc.Invoke(ctx, "/docker.swarmkit.v1.RaftMembership/Leave", in, out, c.cc, opts...)

+	if err != nil {

+		return nil, err

+	}

+	return out, nil

+}

+

+// Server API for RaftMembership service

+

+type RaftMembershipServer interface {

+	// Join adds a RaftMember to the raft cluster.

+	Join(context.Context, *JoinRequest) (*JoinResponse, error)

+	// Leave removes a RaftMember from the raft cluster.

+	Leave(context.Context, *LeaveRequest) (*LeaveResponse, error)

+}

+

+func RegisterRaftMembershipServer(s *grpc.Server, srv RaftMembershipServer) {

+	s.RegisterService(&_RaftMembership_serviceDesc, srv)

+}

+

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

+	in := new(JoinRequest)

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

 		return nil, err

 	}

 	if interceptor == nil {

-		return srv.(RaftServer).ProcessRaftMessage(ctx, in)

+		return srv.(RaftMembershipServer).Join(ctx, in)

 	}

 	info := &grpc.UnaryServerInfo{

 		Server:     srv,