functional-tester/rpcpb: remove "EtcdClientTLS" field

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>

tools/functional-tester/rpcpb/rpc.pb.go

@@ -274,18 +274,16 @@ type Member struct {
 	BaseDir string `protobuf:"bytes,101,opt,name=BaseDir,proto3" json:"BaseDir,omitempty" yaml:"base-dir"`
 	// EtcdLogPath is the log file to store current etcd server logs.
 	EtcdLogPath string `protobuf:"bytes,102,opt,name=EtcdLogPath,proto3" json:"EtcdLogPath,omitempty" yaml:"etcd-log-path"`
-	// EtcdClientTLS is true when client traffic needs to be encrypted.
-	EtcdClientTLS bool `protobuf:"varint,201,opt,name=EtcdClientTLS,proto3" json:"EtcdClientTLS,omitempty" yaml:"etcd-client-tls"`
 	// EtcdClientProxy is true when client traffic needs to be proxied.
 	// If true, listen client URL port must be different than advertise client URL port.
-	EtcdClientProxy bool `protobuf:"varint,202,opt,name=EtcdClientProxy,proto3" json:"EtcdClientProxy,omitempty" yaml:"etcd-client-proxy"`
+	EtcdClientProxy bool `protobuf:"varint,201,opt,name=EtcdClientProxy,proto3" json:"EtcdClientProxy,omitempty" yaml:"etcd-client-proxy"`
 	// EtcdPeerProxy is true when peer traffic needs to be proxied.
 	// If true, listen peer URL port must be different than advertise peer URL port.
-	EtcdPeerProxy bool `protobuf:"varint,203,opt,name=EtcdPeerProxy,proto3" json:"EtcdPeerProxy,omitempty" yaml:"etcd-peer-proxy"`
+	EtcdPeerProxy bool `protobuf:"varint,202,opt,name=EtcdPeerProxy,proto3" json:"EtcdPeerProxy,omitempty" yaml:"etcd-peer-proxy"`
 	// EtcdClientEndpoint is the etcd client endpoint.
-	EtcdClientEndpoint string `protobuf:"bytes,204,opt,name=EtcdClientEndpoint,proto3" json:"EtcdClientEndpoint,omitempty" yaml:"etcd-client-endpoint"`
+	EtcdClientEndpoint string `protobuf:"bytes,301,opt,name=EtcdClientEndpoint,proto3" json:"EtcdClientEndpoint,omitempty" yaml:"etcd-client-endpoint"`
 	// Etcd defines etcd binary configuration flags.
-	Etcd *Etcd `protobuf:"bytes,301,opt,name=Etcd" json:"Etcd,omitempty" yaml:"etcd"`
+	Etcd *Etcd `protobuf:"bytes,302,opt,name=Etcd" json:"Etcd,omitempty" yaml:"etcd"`
 	// ClientCertData contains cert file contents from this member's etcd server.
 	ClientCertData string `protobuf:"bytes,401,opt,name=ClientCertData,proto3" json:"ClientCertData,omitempty" yaml:"client-cert-data"`
 	// ClientKeyData contains key file contents from this member's etcd server.
@@ -827,20 +825,8 @@ func (m *Member) MarshalTo(dAtA []byte) (int, error) {
 		i = encodeVarintRpc(dAtA, i, uint64(len(m.EtcdLogPath)))
 		i += copy(dAtA[i:], m.EtcdLogPath)
 	}
-	if m.EtcdClientTLS {
-		dAtA[i] = 0xc8
-		i++
-		dAtA[i] = 0xc
-		i++
-		if m.EtcdClientTLS {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i++
-	}
 	if m.EtcdClientProxy {
-		dAtA[i] = 0xd0
+		dAtA[i] = 0xc8
 		i++
 		dAtA[i] = 0xc
 		i++
@@ -852,7 +838,7 @@ func (m *Member) MarshalTo(dAtA []byte) (int, error) {
 		i++
 	}
 	if m.EtcdPeerProxy {
-		dAtA[i] = 0xd8
+		dAtA[i] = 0xd0
 		i++
 		dAtA[i] = 0xc
 		i++
@@ -864,15 +850,15 @@ func (m *Member) MarshalTo(dAtA []byte) (int, error) {
 		i++
 	}
 	if len(m.EtcdClientEndpoint) > 0 {
-		dAtA[i] = 0xe2
+		dAtA[i] = 0xea
 		i++
-		dAtA[i] = 0xc
+		dAtA[i] = 0x12
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(len(m.EtcdClientEndpoint)))
 		i += copy(dAtA[i:], m.EtcdClientEndpoint)
 	}
 	if m.Etcd != nil {
-		dAtA[i] = 0xea
+		dAtA[i] = 0xf2
 		i++
 		dAtA[i] = 0x12
 		i++
@@ -1384,9 +1370,6 @@ func (m *Member) Size() (n int) {
 	if l > 0 {
 		n += 2 + l + sovRpc(uint64(l))
 	}
-	if m.EtcdClientTLS {
-		n += 3
-	}
 	if m.EtcdClientProxy {
 		n += 3
 	}
@@ -2448,26 +2431,6 @@ func (m *Member) Unmarshal(dAtA []byte) error {
 			m.EtcdLogPath = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		case 201:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field EtcdClientTLS", wireType)
-			}
-			var v int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowRpc
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			m.EtcdClientTLS = bool(v != 0)
-		case 202:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field EtcdClientProxy", wireType)
 			}
@@ -2487,7 +2450,7 @@ func (m *Member) Unmarshal(dAtA []byte) error {
 				}
 			}
 			m.EtcdClientProxy = bool(v != 0)
-		case 203:
+		case 202:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field EtcdPeerProxy", wireType)
 			}
@@ -2507,7 +2470,7 @@ func (m *Member) Unmarshal(dAtA []byte) error {
 				}
 			}
 			m.EtcdPeerProxy = bool(v != 0)
-		case 204:
+		case 301:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field EtcdClientEndpoint", wireType)
 			}
@@ -2536,7 +2499,7 @@ func (m *Member) Unmarshal(dAtA []byte) error {
 			}
 			m.EtcdClientEndpoint = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 301:
+		case 302:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Etcd", wireType)
 			}
@@ -3700,156 +3663,155 @@ var (
 func init() { proto.RegisterFile("rpcpb/rpc.proto", fileDescriptorRpc) }
 
 var fileDescriptorRpc = []byte{
-	// 2404 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x59, 0xcb, 0x76, 0xdb, 0xc8,
-	0xd1, 0x16, 0x44, 0x4b, 0x23, 0xb5, 0x6e, 0x54, 0xcb, 0xb2, 0x60, 0x7b, 0x46, 0x94, 0xe1, 0xf1,
-	0xfc, 0x1a, 0xfd, 0x81, 0x9c, 0xd8, 0x73, 0x92, 0xd8, 0x73, 0xb1, 0x29, 0x0a, 0xb6, 0x18, 0x41,
-	0x24, 0xdd, 0x84, 0x6c, 0xcf, 0x8a, 0x81, 0xc0, 0xa6, 0x88, 0x08, 0x02, 0x68, 0xa0, 0xa9, 0xa1,
-	0xe6, 0x05, 0xb2, 0xcd, 0x65, 0x93, 0x87, 0xc8, 0x2c, 0xf3, 0x0e, 0x9e, 0x4b, 0x92, 0x49, 0xb2,
-	0xcb, 0x82, 0x49, 0x9c, 0x93, 0x17, 0xe0, 0xc9, 0xe5, 0x64, 0x97, 0xd3, 0x17, 0x90, 0x0d, 0x90,
-	0x94, 0xbd, 0x63, 0x57, 0x7d, 0xdf, 0x87, 0xee, 0xaa, 0x46, 0x55, 0x41, 0x02, 0x4b, 0x61, 0xcb,
-	0x69, 0x1d, 0xdd, 0x0e, 0x5b, 0xce, 0x76, 0x2b, 0x0c, 0x48, 0x00, 0xa7, 0x98, 0xe1, 0x9a, 0x7e,
-	0xec, 0x92, 0x66, 0xfb, 0x68, 0xdb, 0x09, 0x4e, 0x6f, 0x1f, 0x07, 0xc7, 0xc1, 0x6d, 0xe6, 0x3d,
-	0x6a, 0x37, 0xd8, 0x8a, 0x2d, 0xd8, 0x2f, 0xce, 0xd2, 0xfe, 0xbb, 0x00, 0x2e, 0x19, 0xc4, 0xa9,
-	0xc3, 0x9b, 0xe0, 0x52, 0xc9, 0x3e, 0xc5, 0xaa, 0xb2, 0xa1, 0x6c, 0xce, 0xee, 0x2c, 0xf5, 0xba,
-	0xb9, 0xb9, 0x73, 0xfb, 0xd4, 0xbb, 0xaf, 0xf9, 0xf6, 0x29, 0xd6, 0x10, 0x73, 0x42, 0x1d, 0xbc,
-	0xb5, 0x6b, 0x13, 0x7b, 0xd7, 0x0d, 0xd5, 0x49, 0x86, 0x5b, 0xe9, 0x75, 0x73, 0x4b, 0x1c, 0x57,
-	0xb7, 0x89, 0xad, 0xd7, 0xdd, 0x50, 0x43, 0x31, 0x06, 0x6e, 0x81, 0xe9, 0x67, 0x79, 0x93, 0xa2,
-	0x33, 0x0c, 0x0d, 0x7b, 0xdd, 0xdc, 0x22, 0x47, 0x7f, 0x66, 0x7b, 0x1c, 0x2c, 0x10, 0xb0, 0x0c,
-	0x56, 0xf6, 0xb0, 0x1d, 0x92, 0x23, 0x6c, 0x93, 0xa2, 0x4f, 0x70, 0x78, 0x66, 0x7b, 0x07, 0x91,
-	0x3a, 0xb7, 0xa1, 0x6c, 0x66, 0x76, 0xde, 0xe9, 0x75, 0x73, 0x57, 0x39, 0xb1, 0x19, 0x83, 0x74,
-	0x57, 0xa0, 0x34, 0x34, 0x8a, 0x09, 0x8b, 0x60, 0xd9, 0xf0, 0xb0, 0x43, 0xdc, 0xc0, 0xb7, 0xdc,
-	0x53, 0x1c, 0xb4, 0xc9, 0x41, 0xa4, 0xce, 0x33, 0xb9, 0xeb, 0xbd, 0x6e, 0x6e, 0x8d, 0xcb, 0x61,
-	0x01, 0xd1, 0x09, 0xc7, 0x68, 0x68, 0x98, 0x05, 0x8b, 0x20, 0x6b, 0xba, 0x11, 0xc1, 0x7e, 0xc1,
-	0x73, 0xb1, 0x4f, 0x0e, 0x91, 0x19, 0xa9, 0xab, 0x1b, 0x99, 0xcd, 0x59, 0x79, 0x63, 0x1e, 0x43,
-	0xe8, 0x0e, 0x83, 0xe8, 0xed, 0xd0, 0x8b, 0x34, 0x34, 0x44, 0x83, 0x08, 0xac, 0xe4, 0xeb, 0x67,
-	0x38, 0x24, 0x6e, 0x84, 0x25, 0xb5, 0x2b, 0x4c, 0x6d, 0xa3, 0xd7, 0xcd, 0xbd, 0xcd, 0xd5, 0xec,
-	0x18, 0x94, 0x14, 0x1c, 0x45, 0x86, 0xf7, 0xc0, 0x02, 0x5f, 0xe5, 0xdb, 0x24, 0xb0, 0xcc, 0xaa,
-	0xba, 0xb6, 0xa1, 0x6c, 0xce, 0xc8, 0xb9, 0xb1, 0xdb, 0x24, 0xd0, 0x09, 0x15, 0x48, 0x22, 0x61,
-	0x01, 0x2c, 0x72, 0x43, 0x01, 0x87, 0xd4, 0xd8, 0x54, 0x55, 0xc6, 0x95, 0x22, 0x24, 0x9e, 0xef,
-	0xe0, 0x90, 0xe8, 0x76, 0x9b, 0x34, 0x35, 0x94, 0xa2, 0xc0, 0x8f, 0x64, 0x91, 0x47, 0xae, 0x87,
-	0xd5, 0xab, 0x2c, 0xdd, 0x97, 0x7b, 0xdd, 0x5c, 0x56, 0x88, 0x50, 0x76, 0xc3, 0xf5, 0x70, 0x82,
-	0x4d, 0xb1, 0x83, 0xdd, 0xef, 0xe3, 0x73, 0x46, 0xbe, 0x96, 0xbe, 0x59, 0x27, 0xf8, 0x5c, 0x70,
-	0x93, 0x48, 0x68, 0x82, 0x15, 0x6e, 0xb0, 0xc2, 0x76, 0x44, 0x70, 0xbd, 0x90, 0x67, 0x02, 0xd7,
-	0x99, 0xc0, 0xb5, 0x5e, 0x37, 0x77, 0x85, 0x0b, 0x10, 0xee, 0xd6, 0x1d, 0x5b, 0xe8, 0x8c, 0xa2,
-	0xd1, 0x58, 0xf0, 0x74, 0x55, 0x30, 0x0e, 0x59, 0x56, 0x72, 0x2c, 0x2b, 0x52, 0x2c, 0x44, 0x8e,
-	0x5b, 0x18, 0x87, 0x22, 0x21, 0x29, 0x0a, 0xb4, 0xc0, 0x72, 0x3f, 0x45, 0x7d, 0x9d, 0x0d, 0xa6,
-	0xf3, 0x5e, 0xaf, 0x9b, 0xd3, 0xb8, 0x8e, 0xeb, 0xbb, 0xc4, 0xb5, 0x3d, 0x7d, 0x90, 0x65, 0x49,
-	0x72, 0x58, 0x00, 0xde, 0x07, 0x73, 0xf4, 0x77, 0x9c, 0xdf, 0x1b, 0x2c, 0x47, 0x6a, 0xaf, 0x9b,
-	0xbb, 0xcc, 0xf5, 0x18, 0x7b, 0x90, 0x64, 0x19, 0x0c, 0x2b, 0x00, 0xd2, 0x65, 0x2a, 0xcd, 0x1a,
-	0x93, 0x90, 0x2e, 0x1c, 0x93, 0x18, 0xce, 0xf5, 0x08, 0x2e, 0xfc, 0x18, 0xcc, 0x33, 0x6b, 0x9c,
-	0xed, 0x9b, 0x2c, 0xde, 0x57, 0x7b, 0xdd, 0xdc, 0xaa, 0xac, 0x35, 0x48, 0x79, 0x02, 0x1e, 0x1f,
-	0x26, 0x4e, 0xf7, 0xbb, 0x8c, 0x9d, 0x3e, 0xcc, 0x20, 0xe7, 0x32, 0x18, 0x1e, 0x80, 0x65, 0xba,
-	0x4c, 0xe6, 0xfb, 0x16, 0x53, 0xc8, 0xf5, 0xba, 0xb9, 0xeb, 0x92, 0xc2, 0x50, 0xd2, 0x87, 0x99,
-	0x70, 0x07, 0x2c, 0x16, 0x79, 0x2a, 0x0a, 0x1e, 0xb5, 0x87, 0xea, 0xfb, 0xe9, 0xbb, 0x13, 0xa7,
-	0xca, 0xe1, 0x00, 0x0d, 0xa5, 0x18, 0xf4, 0x8d, 0x4e, 0x5a, 0xaa, 0xc4, 0x26, 0x58, 0xdd, 0x62,
-	0x42, 0x52, 0x80, 0x53, 0x42, 0x7a, 0x44, 0x61, 0x1a, 0x1a, 0x45, 0x1e, 0xd6, 0xb4, 0x82, 0x13,
-	0xec, 0xab, 0xff, 0xff, 0x3a, 0x4d, 0x42, 0x61, 0x43, 0x9a, 0x8c, 0x0c, 0x1f, 0x80, 0x85, 0xaa,
-	0x6f, 0xb7, 0xa2, 0x66, 0x40, 0x0a, 0x41, 0xdb, 0x27, 0xea, 0x5d, 0x56, 0x0b, 0xa5, 0xb4, 0x45,
-	0xc2, 0xad, 0x3b, 0xd4, 0xaf, 0xa1, 0x24, 0x1e, 0x9a, 0x60, 0xf9, 0x49, 0x3b, 0x20, 0xf6, 0x8e,
-	0xed, 0x9c, 0x60, 0xbf, 0xbe, 0x73, 0x4e, 0x70, 0xa4, 0x7e, 0xc0, 0x44, 0xd6, 0x7b, 0xdd, 0xdc,
-	0x35, 0x2e, 0xf2, 0x82, 0x42, 0xf4, 0x23, 0x8e, 0xd1, 0x8f, 0x28, 0x48, 0x43, 0xc3, 0x44, 0xda,
-	0x4a, 0x2a, 0x21, 0x7e, 0x1a, 0x10, 0xac, 0x3e, 0x48, 0x97, 0xab, 0x56, 0x88, 0xf5, 0xb3, 0x80,
-	0x46, 0x27, 0xc6, 0xc8, 0x11, 0x09, 0xc2, 0xb0, 0xdd, 0x22, 0x85, 0x26, 0x76, 0x4e, 0xd4, 0x87,
-	0xe9, 0x6b, 0xdc, 0x8f, 0x08, 0x47, 0xe9, 0x0e, 0x85, 0x49, 0x11, 0x91, 0xc8, 0xda, 0x6f, 0x66,
-	0xc0, 0xf4, 0x01, 0x3e, 0x3d, 0xc2, 0x21, 0xbd, 0xd2, 0xb4, 0x0b, 0x1a, 0x1d, 0xec, 0x54, 0x6c,
-	0xd2, 0x14, 0x5d, 0x50, 0x8a, 0x0d, 0x26, 0x4e, 0x5d, 0xc7, 0x1d, 0xec, 0xe8, 0x2d, 0x9b, 0xbe,
-	0x17, 0x09, 0x38, 0xbc, 0x0b, 0x66, 0xf3, 0xc7, 0xb4, 0xac, 0xd6, 0xeb, 0x21, 0x6b, 0x59, 0xb3,
-	0x3b, 0xab, 0xbd, 0x6e, 0x6e, 0x59, 0x54, 0x5f, 0xea, 0xd2, 0xed, 0x7a, 0x3d, 0xd4, 0xd0, 0x00,
-	0x47, 0xe3, 0xf9, 0xc8, 0x76, 0xbd, 0x56, 0xe0, 0xfa, 0x64, 0xcf, 0xb2, 0x2a, 0x8c, 0x3c, 0xcf,
-	0xc8, 0x52, 0x3c, 0x1b, 0x31, 0x44, 0x6f, 0x12, 0xd2, 0x12, 0x2a, 0xc3, 0x44, 0x1a, 0xcf, 0x1d,
-	0x3b, 0xc2, 0xb4, 0xd9, 0xe2, 0x74, 0x01, 0x3d, 0xb2, 0x23, 0x2c, 0x5a, 0xb3, 0xc0, 0xd0, 0x97,
-	0x90, 0x9e, 0xc0, 0x0c, 0x8e, 0xd9, 0x79, 0x1b, 0xe9, 0x97, 0x90, 0x9d, 0xd7, 0x0b, 0x8e, 0xc5,
-	0x71, 0x65, 0x30, 0xcc, 0x83, 0x05, 0xba, 0x14, 0x35, 0xd4, 0xac, 0xaa, 0x5f, 0x2a, 0x2c, 0x0d,
-	0xd2, 0x5b, 0xc3, 0xe8, 0xa2, 0x9a, 0xf0, 0xbe, 0x93, 0x60, 0xc0, 0xc7, 0x60, 0x69, 0x60, 0xa8,
-	0x84, 0x41, 0xe7, 0x5c, 0xfd, 0x8a, 0x8b, 0xbc, 0xdd, 0xeb, 0xe6, 0xd4, 0x61, 0x91, 0x16, 0xc5,
-	0x68, 0x28, 0xcd, 0x8a, 0xf7, 0x42, 0x5f, 0x6d, 0x2e, 0xf3, 0xf5, 0xe8, 0xbd, 0xb0, 0x92, 0x20,
-	0x44, 0x92, 0x0c, 0x5a, 0x20, 0x07, 0xaa, 0x86, 0x5f, 0x67, 0x71, 0x55, 0xbf, 0x51, 0xd2, 0x55,
-	0x45, 0xde, 0x0e, 0x16, 0x30, 0x0d, 0x8d, 0xe0, 0xc2, 0xef, 0xf1, 0x99, 0x4a, 0xfd, 0x82, 0x0e,
-	0x49, 0x73, 0x77, 0xe6, 0xb6, 0xd9, 0x68, 0xb6, 0x4d, 0x6d, 0xf2, 0x64, 0x45, 0x05, 0x35, 0xc4,
-	0xc7, 0xaf, 0x5d, 0xb9, 0x87, 0xd2, 0xf9, 0x49, 0xfd, 0x39, 0x9f, 0x99, 0xc6, 0x74, 0x62, 0x3a,
-	0x6d, 0x25, 0x7a, 0x29, 0xe5, 0xd0, 0x68, 0xf4, 0x3b, 0x24, 0x13, 0xf9, 0x45, 0x26, 0x5d, 0xcf,
-	0x84, 0x08, 0xad, 0xaf, 0x5c, 0x23, 0xc9, 0x80, 0xd6, 0x50, 0x4f, 0x65, 0x42, 0xbf, 0xe4, 0x42,
-	0x37, 0x7a, 0xdd, 0xdc, 0x3b, 0x09, 0x21, 0xa9, 0xcc, 0x72, 0xbd, 0x51, 0x74, 0xf8, 0xc9, 0xa0,
-	0x65, 0x30, 0xb9, 0x7f, 0x65, 0xc6, 0xf7, 0x0c, 0x2e, 0x93, 0xc0, 0xc3, 0x0f, 0xfb, 0x3d, 0x83,
-	0xd1, 0xff, 0x9d, 0x19, 0xdb, 0x34, 0x38, 0x5b, 0x46, 0xc3, 0x52, 0xaa, 0x69, 0x30, 0x89, 0xff,
-	0x64, 0x5e, 0xd7, 0x35, 0xb8, 0xd2, 0x30, 0x55, 0xfb, 0xf3, 0x3c, 0x98, 0xb6, 0x30, 0x2b, 0xfe,
-	0x0f, 0xc0, 0x02, 0xff, 0x55, 0xc2, 0xe4, 0xb3, 0x20, 0x3c, 0x19, 0x2e, 0x1c, 0x84, 0xb9, 0x75,
-	0x9f, 0xfb, 0x35, 0x94, 0xc4, 0xc3, 0xef, 0x03, 0xc0, 0x0d, 0xec, 0xed, 0xe7, 0x43, 0xf5, 0x95,
-	0x5e, 0x37, 0x07, 0x13, 0x6c, 0xfe, 0xd6, 0x4b, 0x48, 0x3a, 0xac, 0xec, 0x62, 0xcf, 0x3e, 0x37,
-	0x6d, 0x82, 0x7d, 0xe7, 0x5c, 0x4c, 0xca, 0x0b, 0xf2, 0x75, 0xa9, 0x53, 0xbf, 0xee, 0x71, 0x80,
-	0x7e, 0x4a, 0x87, 0x95, 0x24, 0x05, 0xfe, 0x08, 0x64, 0x93, 0x16, 0x74, 0xc6, 0x0a, 0xd0, 0x82,
-	0x5c, 0x80, 0xd2, 0x32, 0x7a, 0x78, 0xa6, 0xa1, 0x21, 0x1e, 0xfc, 0x14, 0xac, 0x1e, 0xb6, 0xea,
-	0x36, 0xc1, 0xf5, 0xd4, 0xbe, 0x16, 0x98, 0xe0, 0xcd, 0x5e, 0x37, 0x97, 0xe3, 0x82, 0x6d, 0x0e,
-	0xd3, 0x87, 0xf7, 0x37, 0x5a, 0x81, 0xc6, 0x08, 0x05, 0x6d, 0xbf, 0x6e, 0xba, 0xa7, 0x2e, 0x51,
-	0x57, 0x37, 0x94, 0xcd, 0x29, 0x39, 0x46, 0x21, 0xf5, 0xe9, 0x1e, 0x75, 0x6a, 0x48, 0x42, 0xc2,
-	0x87, 0x60, 0xc1, 0xe8, 0xb8, 0xa4, 0xec, 0xd3, 0x6a, 0xd9, 0x0e, 0xb1, 0x7a, 0x65, 0xa8, 0x34,
-	0x74, 0x5c, 0xa2, 0x07, 0xbe, 0xde, 0xe0, 0x00, 0x5a, 0x1a, 0x64, 0x02, 0xdc, 0x03, 0xd9, 0x42,
-	0xe0, 0x47, 0x6c, 0xc4, 0x73, 0xce, 0x79, 0xcb, 0x59, 0x4b, 0x97, 0x29, 0x67, 0x80, 0x88, 0xdb,
-	0xcd, 0x10, 0x0b, 0xde, 0x03, 0x73, 0x86, 0x6f, 0x1f, 0x79, 0xb8, 0xd2, 0x0a, 0x83, 0x86, 0x98,
-	0xb2, 0xd7, 0x7a, 0xdd, 0xdc, 0x8a, 0xd8, 0x09, 0x73, 0xea, 0x2d, 0xea, 0xa5, 0xe5, 0x76, 0x80,
-	0x85, 0x1f, 0x81, 0x79, 0xb1, 0x9f, 0x82, 0x1d, 0xe1, 0x78, 0x2a, 0x95, 0xee, 0xbe, 0xd8, 0xbd,
-	0xee, 0x50, 0xb7, 0x86, 0x12, 0x68, 0x7a, 0x51, 0xc4, 0x9a, 0x45, 0xf5, 0x80, 0x4e, 0xa3, 0xa9,
-	0x8b, 0x12, 0xf3, 0x79, 0x42, 0xd8, 0x45, 0x49, 0x52, 0xe8, 0x9c, 0x24, 0x2c, 0xd5, 0x66, 0xbb,
-	0xd1, 0xf0, 0xb0, 0x18, 0x41, 0xa5, 0x50, 0xc6, 0x22, 0x11, 0x07, 0x0c, 0x34, 0x04, 0x03, 0xee,
-	0x4b, 0xed, 0xae, 0x10, 0x9c, 0x9e, 0xda, 0x7e, 0x3d, 0x52, 0xb5, 0xf4, 0x57, 0xd4, 0xa0, 0xdd,
-	0x39, 0x02, 0x23, 0x77, 0xbb, 0x98, 0x47, 0x4f, 0x85, 0xda, 0xbe, 0x8f, 0xc3, 0x7e, 0xc7, 0x7e,
-	0x3f, 0x5d, 0x2d, 0x43, 0xe6, 0x97, 0x7b, 0x76, 0x8a, 0x42, 0x3f, 0xeb, 0x8c, 0x0e, 0xc1, 0xa1,
-	0x6f, 0x7b, 0x7d, 0x19, 0x3e, 0xb6, 0x49, 0x1b, 0xc2, 0x02, 0x21, 0x0b, 0x0d, 0xd1, 0x68, 0x7a,
-	0xab, 0x24, 0xc4, 0x51, 0x64, 0x9d, 0xb7, 0x70, 0xa4, 0x62, 0x76, 0x2c, 0x29, 0xbd, 0x11, 0x73,
-	0xea, 0x84, 0x7a, 0x35, 0x24, 0x63, 0xe9, 0x2d, 0xe5, 0xcb, 0x7d, 0x7c, 0x5e, 0x75, 0x3f, 0xc7,
-	0xac, 0x17, 0x4f, 0xc9, 0xa1, 0x15, 0x64, 0x5a, 0xdd, 0x22, 0xf7, 0x73, 0x7a, 0x4b, 0x13, 0x04,
-	0xda, 0xc0, 0x12, 0x06, 0xd3, 0x0e, 0x8f, 0xb1, 0x7a, 0xcc, 0x64, 0xa4, 0xd1, 0x28, 0x25, 0xa3,
-	0x7b, 0x14, 0xa6, 0xa1, 0x11, 0x5c, 0xf8, 0x14, 0x5c, 0x1e, 0x58, 0xdb, 0x8d, 0x86, 0xdb, 0x41,
-	0xb6, 0x7f, 0x8c, 0xd5, 0x26, 0xd3, 0xd4, 0x7a, 0xdd, 0xdc, 0xfa, 0xb0, 0x26, 0xc3, 0xe9, 0x21,
-	0x05, 0x6a, 0x68, 0x24, 0x1f, 0xfe, 0x18, 0xac, 0x8d, 0xb2, 0x5b, 0x1d, 0x5f, 0x75, 0x99, 0xb4,
-	0xf4, 0x8d, 0x34, 0x46, 0x5a, 0x27, 0x1d, 0x5f, 0x43, 0xe3, 0x64, 0xe8, 0x60, 0xd1, 0x77, 0x59,
-	0x1d, 0xbf, 0xdc, 0x8a, 0xd4, 0x9f, 0x30, 0x65, 0x29, 0xa5, 0x92, 0x32, 0xe9, 0xf8, 0x7a, 0xd0,
-	0x8a, 0x34, 0x94, 0x66, 0x0d, 0xd2, 0xc2, 0xdb, 0x59, 0xc4, 0x87, 0x9c, 0xa9, 0xc4, 0xbc, 0xcc,
-	0x75, 0x78, 0x23, 0x8c, 0xfa, 0x69, 0x11, 0x04, 0xf8, 0x01, 0x98, 0xe5, 0x86, 0x27, 0x95, 0x2a,
-	0x9f, 0x6e, 0xa6, 0xe4, 0xa9, 0x50, 0xb0, 0x5f, 0xd0, 0xa7, 0x0f, 0x80, 0xda, 0x4f, 0x15, 0xf0,
-	0x16, 0xc2, 0x2f, 0xda, 0x38, 0x22, 0x70, 0x1b, 0xcc, 0x96, 0x5b, 0x38, 0xb4, 0x89, 0x1b, 0xf8,
-	0xac, 0xb3, 0x2c, 0xde, 0xc9, 0x8a, 0x59, 0xa2, 0x6f, 0x47, 0x03, 0x08, 0xbc, 0x15, 0xcf, 0xb3,
-	0x2a, 0x1f, 0x3c, 0x16, 0x04, 0x98, 0x1b, 0x51, 0x3c, 0xec, 0xde, 0x8a, 0xdb, 0x17, 0xfb, 0xb3,
-	0xcc, 0x00, 0xc6, 0x8d, 0x48, 0x38, 0x35, 0x07, 0xcc, 0x20, 0x1c, 0xb5, 0x02, 0x3f, 0xc2, 0x50,
-	0x05, 0x6f, 0x55, 0xdb, 0x8e, 0x83, 0xa3, 0x88, 0xed, 0x63, 0x06, 0xc5, 0x4b, 0x78, 0x05, 0x4c,
-	0xd3, 0x6f, 0x96, 0x76, 0xc4, 0x9b, 0x17, 0x12, 0x2b, 0x69, 0x2f, 0x99, 0x0b, 0xf6, 0xb2, 0xf5,
-	0x17, 0x45, 0x3a, 0x23, 0x5c, 0x04, 0xa0, 0x14, 0x90, 0x2a, 0xb1, 0x43, 0x82, 0xeb, 0xd9, 0x09,
-	0x78, 0x19, 0x64, 0xc5, 0xe0, 0xce, 0x6c, 0x74, 0x52, 0xca, 0x2a, 0x70, 0x09, 0xcc, 0x21, 0x1c,
-	0xf5, 0x0d, 0x93, 0x70, 0x1e, 0xcc, 0xec, 0xbb, 0x9e, 0xc7, 0x56, 0x19, 0xea, 0xa6, 0x05, 0x23,
-	0x1f, 0x3a, 0x4d, 0xf7, 0x0c, 0x67, 0x2f, 0x51, 0x95, 0x5d, 0x1c, 0x91, 0x30, 0x38, 0xa7, 0x08,
-	0x36, 0x80, 0x67, 0xa7, 0xe0, 0x55, 0xb0, 0xba, 0xe3, 0xd9, 0xce, 0x49, 0x33, 0xf0, 0xd8, 0x87,
-	0x76, 0x25, 0x08, 0x89, 0xd5, 0x41, 0x9d, 0x6c, 0x1d, 0x5e, 0x07, 0x6b, 0x87, 0xfe, 0xd1, 0x48,
-	0x27, 0x86, 0xab, 0x60, 0x99, 0x95, 0xc5, 0x84, 0xb9, 0x01, 0xd7, 0xc0, 0xca, 0xa1, 0x5f, 0x1f,
-	0x72, 0x1c, 0x6f, 0xfd, 0x63, 0x86, 0xef, 0x47, 0x54, 0x64, 0xca, 0xdf, 0x2f, 0x9a, 0x66, 0xad,
-	0x5c, 0x32, 0x6a, 0x8f, 0xca, 0xa6, 0x59, 0x7e, 0x66, 0xa0, 0xec, 0x04, 0xfc, 0x0e, 0xd8, 0x1c,
-	0x32, 0xd7, 0x0e, 0x4b, 0x56, 0xd1, 0xac, 0x59, 0xa8, 0xf8, 0xf8, 0xb1, 0x81, 0x6a, 0xd5, 0x52,
-	0xbe, 0x52, 0xdd, 0x2b, 0x5b, 0x3c, 0x04, 0x0c, 0x6d, 0x1a, 0xf9, 0x5d, 0x03, 0x65, 0x27, 0xe1,
-	0x7b, 0x40, 0x93, 0x0c, 0xe3, 0x88, 0x99, 0x3e, 0xf1, 0xc9, 0x61, 0x19, 0x1d, 0x1e, 0x64, 0x2f,
-	0xb1, 0xd8, 0x51, 0x43, 0xde, 0x34, 0xb3, 0x53, 0x70, 0x0b, 0xbc, 0xb7, 0x63, 0xe6, 0x0b, 0xfb,
-	0x7b, 0x65, 0xd3, 0xa8, 0x55, 0x0c, 0x03, 0xd5, 0x2a, 0x65, 0x64, 0xd5, 0xac, 0xe7, 0x35, 0xf4,
-	0x3c, 0xb9, 0xe3, 0x3a, 0xcc, 0x83, 0x8f, 0xdf, 0x0c, 0x3b, 0x6e, 0x37, 0x18, 0xbe, 0x0b, 0x36,
-	0xc6, 0x4b, 0x88, 0xb3, 0x35, 0xe0, 0x87, 0xe0, 0x07, 0xaf, 0x43, 0x8d, 0x7b, 0xc4, 0xf1, 0xc5,
-	0x8f, 0x10, 0x51, 0x68, 0xc2, 0x1b, 0xe0, 0x9d, 0xf1, 0x28, 0x1a, 0x1a, 0x17, 0xfe, 0x1f, 0xd0,
-	0x76, 0x0d, 0x33, 0xff, 0xe9, 0xc5, 0x61, 0x79, 0xa9, 0xc0, 0x6d, 0xf0, 0x3e, 0xca, 0x97, 0x76,
-	0xcb, 0x07, 0xb5, 0x37, 0xc0, 0x7f, 0xa9, 0xc0, 0x4f, 0xc0, 0xbd, 0xd7, 0x03, 0xc7, 0x1d, 0xf0,
-	0x2b, 0x05, 0x1a, 0xe0, 0xe1, 0x1b, 0x3f, 0x6f, 0x9c, 0xcc, 0xd7, 0x0a, 0xbc, 0x01, 0xde, 0x1e,
-	0xcd, 0x17, 0x79, 0xf8, 0x46, 0x81, 0x9b, 0xe0, 0xe6, 0x85, 0x4f, 0x12, 0xc8, 0xdf, 0x2a, 0xf0,
-	0x87, 0xe0, 0xee, 0x45, 0x90, 0x71, 0xdb, 0xf8, 0x9d, 0x02, 0x1f, 0x80, 0xfb, 0x6f, 0xf0, 0x8c,
-	0x71, 0x02, 0xbf, 0xbf, 0xe0, 0x1c, 0x22, 0xd9, 0xdf, 0xbe, 0xfe, 0x1c, 0x02, 0xf9, 0x07, 0x05,
-	0xae, 0x83, 0xab, 0xa3, 0x21, 0xf4, 0x4e, 0xfc, 0x51, 0x81, 0xb7, 0xc0, 0xc6, 0x85, 0x4a, 0x14,
-	0xf6, 0x27, 0x05, 0xaa, 0x60, 0xa5, 0x54, 0xae, 0x3d, 0xca, 0x17, 0xcd, 0xda, 0xb3, 0xa2, 0xb5,
-	0x57, 0xab, 0x5a, 0xc8, 0xa8, 0x56, 0xb3, 0xbf, 0x9e, 0xa4, 0x5b, 0x49, 0x78, 0x4a, 0x65, 0xe1,
-	0xac, 0x3d, 0x2a, 0xa3, 0x9a, 0x59, 0x7c, 0x6a, 0x94, 0x28, 0xf2, 0x8b, 0x49, 0xb8, 0x04, 0x00,
-	0x85, 0x55, 0xca, 0xc5, 0x92, 0x55, 0xcd, 0xfe, 0x2c, 0x03, 0x17, 0xc0, 0x8c, 0xf1, 0xdc, 0x32,
-	0x50, 0x29, 0x6f, 0x66, 0xff, 0x99, 0xd9, 0x0a, 0x00, 0x18, 0x8c, 0x15, 0x70, 0x1a, 0x4c, 0xee,
-	0x3f, 0xcd, 0x4e, 0xc0, 0x59, 0x30, 0x65, 0x1a, 0xf9, 0xaa, 0x91, 0x55, 0xe0, 0x0a, 0x58, 0x32,
-	0x4c, 0xa3, 0x60, 0x15, 0xcb, 0xa5, 0x1a, 0x3a, 0x2c, 0x95, 0x58, 0xdd, 0xc8, 0x82, 0xf9, 0x67,
-	0x79, 0xab, 0xb0, 0x17, 0x5b, 0x32, 0xb4, 0x3e, 0x99, 0xe5, 0xc2, 0x7e, 0x0d, 0xe5, 0x0b, 0x06,
-	0x8a, 0xcd, 0x97, 0x28, 0x90, 0x09, 0xc5, 0x96, 0xa9, 0x3b, 0x0f, 0xc0, 0xac, 0x15, 0xda, 0x7e,
-	0xd4, 0x0a, 0x42, 0x02, 0xef, 0xc8, 0x8b, 0x45, 0x51, 0xeb, 0x45, 0x1f, 0xbb, 0xb6, 0xd4, 0x5f,
-	0xf3, 0x76, 0xa2, 0x4d, 0x6c, 0x2a, 0xdf, 0x55, 0x76, 0x2e, 0xbf, 0xfc, 0xdb, 0xfa, 0xc4, 0xcb,
-	0x57, 0xeb, 0xca, 0xb7, 0xaf, 0xd6, 0x95, 0xbf, 0xbe, 0x5a, 0x57, 0x7e, 0xf5, 0xf7, 0xf5, 0x89,
-	0xa3, 0x69, 0xf6, 0x8f, 0x89, 0xbb, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x8b, 0x82, 0xf1,
-	0xe1, 0x18, 0x00, 0x00,
+	// 2390 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x59, 0xdb, 0x76, 0xdb, 0xc6,
+	0xd5, 0x16, 0x44, 0x4b, 0x96, 0x46, 0x27, 0x6a, 0x64, 0x59, 0xb0, 0x9d, 0x08, 0x32, 0x1c, 0xe7,
+	0x57, 0xf4, 0x17, 0x72, 0x6b, 0x67, 0xb5, 0xb5, 0x73, 0xb0, 0x29, 0x0a, 0xb6, 0x58, 0x41, 0x24,
+	0x3d, 0x84, 0x6c, 0xe7, 0x8a, 0x85, 0xc0, 0xa1, 0x88, 0x0a, 0x02, 0x68, 0x60, 0xa8, 0x50, 0x79,
+	0x81, 0xde, 0xf6, 0x70, 0xd3, 0x87, 0x68, 0xfa, 0x1c, 0x4e, 0x7a, 0x4a, 0xdb, 0xbb, 0x5e, 0xb0,
+	0xad, 0xbb, 0xfa, 0x02, 0x5c, 0x3d, 0xac, 0xde, 0x75, 0xcd, 0x81, 0xe4, 0x00, 0x24, 0x65, 0xdf,
+	0x69, 0xf6, 0xfe, 0xbe, 0x0f, 0x33, 0x7b, 0xcf, 0xec, 0xbd, 0x69, 0x83, 0xa5, 0xa8, 0xe9, 0x36,
+	0x8f, 0xee, 0x44, 0x4d, 0x77, 0xbb, 0x19, 0x85, 0x24, 0x84, 0x53, 0xcc, 0x70, 0xdd, 0x38, 0xf6,
+	0x48, 0xa3, 0x75, 0xb4, 0xed, 0x86, 0xa7, 0x77, 0x8e, 0xc3, 0xe3, 0xf0, 0x0e, 0xf3, 0x1e, 0xb5,
+	0xea, 0x6c, 0xc5, 0x16, 0xec, 0x2f, 0xce, 0xd2, 0xff, 0xbb, 0x00, 0x2e, 0x99, 0xc4, 0xad, 0xc1,
+	0x5b, 0xe0, 0x52, 0xd1, 0x39, 0xc5, 0xaa, 0xb2, 0xa1, 0x6c, 0xce, 0xee, 0x2c, 0x75, 0x3b, 0xda,
+	0xdc, 0xb9, 0x73, 0xea, 0x3f, 0xd0, 0x03, 0xe7, 0x14, 0xeb, 0x88, 0x39, 0xa1, 0x01, 0x2e, 0xef,
+	0x3a, 0xc4, 0xd9, 0xf5, 0x22, 0x75, 0x92, 0xe1, 0x56, 0xba, 0x1d, 0x6d, 0x89, 0xe3, 0x6a, 0x0e,
+	0x71, 0x8c, 0x9a, 0x17, 0xe9, 0xa8, 0x87, 0x81, 0x5b, 0x60, 0xfa, 0x79, 0xce, 0xa2, 0xe8, 0x0c,
+	0x43, 0xc3, 0x6e, 0x47, 0x5b, 0xe4, 0xe8, 0xcf, 0x1d, 0x9f, 0x83, 0x05, 0x02, 0x96, 0xc0, 0xca,
+	0x1e, 0x76, 0x22, 0x72, 0x84, 0x1d, 0x52, 0x08, 0x08, 0x8e, 0xce, 0x1c, 0xff, 0x20, 0x56, 0xe7,
+	0x36, 0x94, 0xcd, 0xcc, 0xce, 0xbb, 0xdd, 0x8e, 0x76, 0x8d, 0x13, 0x1b, 0x3d, 0x90, 0xe1, 0x09,
+	0x94, 0x8e, 0x46, 0x31, 0x61, 0x01, 0x2c, 0x9b, 0x3e, 0x76, 0x89, 0x17, 0x06, 0xb6, 0x77, 0x8a,
+	0xc3, 0x16, 0x39, 0x88, 0xd5, 0x79, 0x26, 0x77, 0xa3, 0xdb, 0xd1, 0xd6, 0xb8, 0x1c, 0x16, 0x10,
+	0x83, 0x70, 0x8c, 0x8e, 0x86, 0x59, 0xb0, 0x00, 0xb2, 0x96, 0x17, 0x13, 0x1c, 0xe4, 0x7d, 0x0f,
+	0x07, 0xe4, 0x10, 0x59, 0xb1, 0xba, 0xba, 0x91, 0xd9, 0x9c, 0x95, 0x37, 0xe6, 0x33, 0x84, 0xe1,
+	0x32, 0x88, 0xd1, 0x8a, 0xfc, 0x58, 0x47, 0x43, 0x34, 0x88, 0xc0, 0x4a, 0xae, 0x76, 0x86, 0x23,
+	0xe2, 0xc5, 0x58, 0x52, 0xbb, 0xca, 0xd4, 0x36, 0xba, 0x1d, 0xed, 0x1d, 0xae, 0xe6, 0xf4, 0x40,
+	0x49, 0xc1, 0x51, 0x64, 0x78, 0x1f, 0x2c, 0xf0, 0x55, 0xae, 0x45, 0x42, 0xdb, 0xaa, 0xa8, 0x6b,
+	0x1b, 0xca, 0xe6, 0x8c, 0x9c, 0x1b, 0xa7, 0x45, 0x42, 0x83, 0x50, 0x81, 0x24, 0x12, 0xe6, 0xc1,
+	0x22, 0x37, 0xe4, 0x71, 0x44, 0x8d, 0x0d, 0x55, 0x65, 0x5c, 0x29, 0x42, 0xe2, 0xfb, 0x2e, 0x8e,
+	0x88, 0xe1, 0xb4, 0x48, 0x43, 0x47, 0x29, 0x0a, 0xfc, 0x58, 0x16, 0x79, 0xec, 0xf9, 0x58, 0xbd,
+	0xc6, 0xd2, 0x7d, 0xa5, 0xdb, 0xd1, 0xb2, 0x42, 0x84, 0xb2, 0xeb, 0x9e, 0x8f, 0x13, 0x6c, 0x8a,
+	0x1d, 0xec, 0x7e, 0x1f, 0x9f, 0x33, 0xf2, 0xf5, 0xf4, 0xcd, 0x3a, 0xc1, 0xe7, 0x82, 0x9b, 0x44,
+	0x42, 0x0b, 0xac, 0x70, 0x83, 0x1d, 0xb5, 0x62, 0x82, 0x6b, 0xf9, 0x1c, 0x13, 0xb8, 0xc1, 0x04,
+	0xae, 0x77, 0x3b, 0xda, 0x55, 0x2e, 0x40, 0xb8, 0xdb, 0x70, 0x1d, 0xa1, 0x33, 0x8a, 0x46, 0x63,
+	0xc1, 0xd3, 0x55, 0xc6, 0x38, 0x62, 0x59, 0xd1, 0x58, 0x56, 0xa4, 0x58, 0x88, 0x1c, 0x37, 0x31,
+	0x8e, 0x44, 0x42, 0x52, 0x14, 0x68, 0x83, 0xe5, 0x7e, 0x8a, 0xfa, 0x3a, 0x1b, 0x4c, 0xe7, 0xfd,
+	0x6e, 0x47, 0xd3, 0xb9, 0x8e, 0x17, 0x78, 0xc4, 0x73, 0x7c, 0x63, 0x90, 0x65, 0x49, 0x72, 0x58,
+	0x00, 0x3e, 0x00, 0x73, 0xf4, 0xef, 0x5e, 0x7e, 0x6f, 0xb2, 0x1c, 0xa9, 0xdd, 0x8e, 0x76, 0x85,
+	0xeb, 0x31, 0xf6, 0x20, 0xc9, 0x32, 0x18, 0x96, 0x01, 0xa4, 0xcb, 0x54, 0x9a, 0x75, 0x26, 0x21,
+	0x5d, 0x38, 0x26, 0x31, 0x9c, 0xeb, 0x11, 0x5c, 0xf8, 0x09, 0x98, 0x67, 0xd6, 0x5e, 0xb6, 0x6f,
+	0xb1, 0x78, 0x5f, 0xeb, 0x76, 0xb4, 0x55, 0x59, 0x6b, 0x90, 0xf2, 0x04, 0xbc, 0x77, 0x98, 0x5e,
+	0xba, 0xdf, 0x63, 0xec, 0xf4, 0x61, 0x06, 0x39, 0x97, 0xc1, 0xf0, 0x00, 0x2c, 0xd3, 0x65, 0x32,
+	0xdf, 0xb7, 0x99, 0x82, 0xd6, 0xed, 0x68, 0x37, 0x24, 0x85, 0xa1, 0xa4, 0x0f, 0x33, 0xe1, 0x0e,
+	0x58, 0x2c, 0xf0, 0x54, 0xe4, 0x7d, 0x6a, 0x8f, 0xd4, 0x0f, 0xd2, 0x77, 0xa7, 0x97, 0x2a, 0x97,
+	0x03, 0x74, 0x94, 0x62, 0xd0, 0x17, 0x9d, 0xb4, 0x54, 0x88, 0x43, 0xb0, 0xba, 0xc5, 0x84, 0xa4,
+	0x00, 0xa7, 0x84, 0x8c, 0x98, 0xc2, 0x74, 0x34, 0x8a, 0x3c, 0xac, 0x69, 0x87, 0x27, 0x38, 0x50,
+	0xff, 0xff, 0x4d, 0x9a, 0x84, 0xc2, 0x86, 0x34, 0x19, 0x19, 0x3e, 0x04, 0x0b, 0x95, 0xc0, 0x69,
+	0xc6, 0x8d, 0x90, 0xe4, 0xc3, 0x56, 0x40, 0xd4, 0x7b, 0xac, 0x16, 0x4a, 0x69, 0x8b, 0x85, 0xdb,
+	0x70, 0xa9, 0x5f, 0x47, 0x49, 0x3c, 0xb4, 0xc0, 0xf2, 0xd3, 0x56, 0x48, 0x9c, 0x1d, 0xc7, 0x3d,
+	0xc1, 0x41, 0x6d, 0xe7, 0x9c, 0xe0, 0x58, 0xfd, 0x90, 0x89, 0xac, 0x77, 0x3b, 0xda, 0x75, 0x2e,
+	0xf2, 0x92, 0x42, 0x8c, 0x23, 0x8e, 0x31, 0x8e, 0x28, 0x48, 0x47, 0xc3, 0x44, 0xda, 0x4a, 0xca,
+	0x11, 0x7e, 0x16, 0x12, 0xac, 0x3e, 0x4c, 0x97, 0xab, 0x66, 0x84, 0x8d, 0xb3, 0x90, 0x46, 0xa7,
+	0x87, 0x91, 0x23, 0x12, 0x46, 0x51, 0xab, 0x49, 0xf2, 0x0d, 0xec, 0x9e, 0xa8, 0x8f, 0xd2, 0xd7,
+	0xb8, 0x1f, 0x11, 0x8e, 0x32, 0x5c, 0x0a, 0x93, 0x22, 0x22, 0x91, 0xf5, 0xee, 0x65, 0x30, 0x7d,
+	0x80, 0x4f, 0x8f, 0x70, 0x44, 0xaf, 0x34, 0xed, 0x82, 0x66, 0x1b, 0xbb, 0x65, 0x87, 0x34, 0x44,
+	0x17, 0x94, 0x62, 0x83, 0x89, 0x5b, 0x33, 0x70, 0x1b, 0xbb, 0x46, 0xd3, 0xa1, 0xef, 0x22, 0x01,
+	0x87, 0xf7, 0xc0, 0x6c, 0xee, 0x98, 0x96, 0xd5, 0x5a, 0x2d, 0x62, 0x2d, 0x6b, 0x76, 0x67, 0xb5,
+	0xdb, 0xd1, 0x96, 0x45, 0xf5, 0xa5, 0x2e, 0xc3, 0xa9, 0xd5, 0x22, 0x1d, 0x0d, 0x70, 0x34, 0x9e,
+	0x8f, 0x1d, 0xcf, 0x6f, 0x86, 0x5e, 0x40, 0xf6, 0x6c, 0xbb, 0xcc, 0xc8, 0xf3, 0x8c, 0x2c, 0xc5,
+	0xb3, 0xde, 0x83, 0x18, 0x0d, 0x42, 0x9a, 0x42, 0x65, 0x98, 0x48, 0xe3, 0xb9, 0xe3, 0xc4, 0x98,
+	0x36, 0x5b, 0x9c, 0x2e, 0xa0, 0x47, 0x4e, 0x8c, 0x45, 0x6b, 0x16, 0x18, 0xfa, 0x08, 0xe9, 0x09,
+	0xac, 0xf0, 0x98, 0x9d, 0xb7, 0x9e, 0x7e, 0x84, 0xec, 0xbc, 0x7e, 0x78, 0x2c, 0x8e, 0x2b, 0x83,
+	0xe1, 0x13, 0xb0, 0x44, 0x97, 0xbc, 0x2a, 0x94, 0xa3, 0xb0, 0x7d, 0xae, 0x7e, 0xa5, 0xb0, 0x44,
+	0xbc, 0xd3, 0xed, 0x68, 0xaa, 0x24, 0x20, 0xea, 0x49, 0x93, 0x62, 0x74, 0x94, 0x66, 0xc1, 0x1c,
+	0x58, 0xa0, 0x26, 0xfa, 0x2e, 0xb9, 0xcc, 0xd7, 0x5c, 0x46, 0x7a, 0x7e, 0x4c, 0x86, 0xbd, 0x67,
+	0x21, 0x92, 0x64, 0xd0, 0xea, 0x36, 0x50, 0x35, 0x83, 0x1a, 0x0b, 0x8a, 0xfa, 0xe5, 0x64, 0xba,
+	0x24, 0xc8, 0xdb, 0xc1, 0x02, 0xa6, 0xa3, 0x11, 0x5c, 0xf8, 0x1d, 0x3e, 0x10, 0xa9, 0xbf, 0xa2,
+	0x1a, 0x73, 0x77, 0xe7, 0xb6, 0xd9, 0x5c, 0xb5, 0x4d, 0x6d, 0xf2, 0x58, 0x44, 0x05, 0x75, 0xc4,
+	0x67, 0xa7, 0x5d, 0xb9, 0x01, 0xd2, 0xe1, 0x47, 0xfd, 0x29, 0x1f, 0x78, 0xc6, 0xb4, 0x51, 0x3a,
+	0x2a, 0x25, 0x1a, 0x21, 0xe5, 0xd0, 0x68, 0xf4, 0xdb, 0x1b, 0x13, 0xf9, 0x59, 0x26, 0x5d, 0x8c,
+	0x84, 0x08, 0x2d, 0x8e, 0x5c, 0x23, 0xc9, 0x80, 0xf6, 0x50, 0x43, 0x64, 0x42, 0x3f, 0xe7, 0x42,
+	0x37, 0xbb, 0x1d, 0xed, 0xdd, 0x84, 0x90, 0x54, 0x23, 0xb9, 0xde, 0x28, 0x3a, 0xfc, 0x74, 0x50,
+	0xef, 0x99, 0xdc, 0xbf, 0x32, 0xe3, 0x0b, 0x3e, 0x97, 0x49, 0xe0, 0xe1, 0x47, 0xfd, 0x82, 0xcf,
+	0xe8, 0xff, 0xce, 0x8c, 0xad, 0xf8, 0x9c, 0x2d, 0xa3, 0x61, 0x31, 0x55, 0xf1, 0x99, 0xc4, 0x7f,
+	0x32, 0x6f, 0x2a, 0xf9, 0x5c, 0x69, 0x98, 0xaa, 0xff, 0x79, 0x1e, 0x4c, 0xdb, 0x98, 0x55, 0xee,
+	0x87, 0x60, 0x81, 0xff, 0x55, 0xc4, 0xe4, 0xf3, 0x30, 0x3a, 0x19, 0x7e, 0xf5, 0x84, 0xb9, 0x8d,
+	0x80, 0xfb, 0x75, 0x94, 0xc4, 0xc3, 0xef, 0x02, 0xc0, 0x0d, 0xec, 0xe9, 0xf2, 0x3b, 0x77, 0xb5,
+	0xdb, 0xd1, 0x60, 0x82, 0xcd, 0x9f, 0xac, 0x84, 0xa4, 0x93, 0xc6, 0x2e, 0xf6, 0x9d, 0x73, 0xcb,
+	0x21, 0x38, 0x70, 0xcf, 0xc5, 0x98, 0xbb, 0x20, 0x5f, 0x97, 0x1a, 0xf5, 0x1b, 0x3e, 0x07, 0x18,
+	0xa7, 0x74, 0xd2, 0x48, 0x52, 0xe0, 0x0f, 0x40, 0x36, 0x69, 0x41, 0x67, 0xac, 0x7a, 0x2c, 0xc8,
+	0xd5, 0x23, 0x2d, 0x63, 0x44, 0x67, 0x3a, 0x1a, 0xe2, 0xc1, 0xcf, 0xc0, 0xea, 0x61, 0xb3, 0xe6,
+	0x10, 0x5c, 0x4b, 0xed, 0x6b, 0x81, 0x09, 0xde, 0xea, 0x76, 0x34, 0x8d, 0x0b, 0xb6, 0x38, 0xcc,
+	0x18, 0xde, 0xdf, 0x68, 0x05, 0x1a, 0x23, 0x14, 0xb6, 0x82, 0x9a, 0xe5, 0x9d, 0x7a, 0x44, 0x5d,
+	0xdd, 0x50, 0x36, 0xa7, 0xe4, 0x18, 0x45, 0xd4, 0x67, 0xf8, 0xd4, 0xa9, 0x23, 0x09, 0x09, 0x1f,
+	0x81, 0x05, 0xb3, 0xed, 0x91, 0x52, 0x40, 0x4b, 0x5d, 0x2b, 0xc2, 0xea, 0xd5, 0xa1, 0xd2, 0xd0,
+	0xf6, 0x88, 0x11, 0x06, 0x46, 0x9d, 0x03, 0x68, 0x69, 0x90, 0x09, 0x70, 0x0f, 0x64, 0xf3, 0x61,
+	0x10, 0xb3, 0xf9, 0xcc, 0x3d, 0xe7, 0xfd, 0x62, 0x2d, 0x5d, 0xa6, 0xdc, 0x01, 0xa2, 0xd7, 0x2b,
+	0x86, 0x58, 0xf0, 0x3e, 0x98, 0x33, 0x03, 0xe7, 0xc8, 0xc7, 0xe5, 0x66, 0x14, 0xd6, 0xc5, 0x88,
+	0xbc, 0xd6, 0xed, 0x68, 0x2b, 0x62, 0x27, 0xcc, 0x69, 0x34, 0xa9, 0x97, 0xd6, 0xca, 0x01, 0x16,
+	0x7e, 0x0c, 0xe6, 0xc5, 0x7e, 0xf2, 0x4e, 0x8c, 0x7b, 0x23, 0xa5, 0x74, 0xf7, 0xc5, 0xee, 0x0d,
+	0x97, 0xba, 0x75, 0x94, 0x40, 0xd3, 0x8b, 0x22, 0xd6, 0x2c, 0xaa, 0x07, 0x74, 0x94, 0x4c, 0x5d,
+	0x94, 0x1e, 0x9f, 0x27, 0x84, 0x5d, 0x94, 0x24, 0x85, 0x0e, 0x39, 0xc2, 0x52, 0x69, 0xb4, 0xea,
+	0x75, 0x1f, 0x8b, 0xf9, 0x51, 0x0a, 0x65, 0x4f, 0x24, 0xe6, 0x80, 0x81, 0x86, 0x60, 0xc0, 0x7d,
+	0xa9, 0x57, 0xe5, 0xc3, 0xd3, 0x53, 0x27, 0xa8, 0xc5, 0xaa, 0x9e, 0xfe, 0x09, 0x34, 0xe8, 0x55,
+	0xae, 0xc0, 0xc8, 0xad, 0xaa, 0xc7, 0xa3, 0xa7, 0x42, 0xad, 0x20, 0xc0, 0x51, 0xbf, 0xdd, 0x7e,
+	0x90, 0xae, 0x96, 0x11, 0xf3, 0xcb, 0x0d, 0x37, 0x45, 0xa1, 0xbf, 0xc9, 0xcc, 0x36, 0xc1, 0x51,
+	0xe0, 0xf8, 0x7d, 0x19, 0x3e, 0x73, 0x49, 0x1b, 0xc2, 0x02, 0x21, 0x0b, 0x0d, 0xd1, 0x68, 0x7a,
+	0x2b, 0x24, 0xc2, 0x71, 0x6c, 0x9f, 0x37, 0x71, 0xac, 0x62, 0x76, 0x2c, 0x29, 0xbd, 0x31, 0x73,
+	0x1a, 0x84, 0x7a, 0x75, 0x24, 0x63, 0xe9, 0x2d, 0xe5, 0xcb, 0x7d, 0x7c, 0x5e, 0xf1, 0xbe, 0xc0,
+	0xac, 0x91, 0x4e, 0xc9, 0xa1, 0x15, 0x64, 0x5a, 0xdd, 0x62, 0xef, 0x0b, 0x7a, 0x4b, 0x13, 0x04,
+	0xda, 0xc0, 0x12, 0x06, 0xcb, 0x89, 0x8e, 0xb1, 0x7a, 0xcc, 0x64, 0xa4, 0xb9, 0x26, 0x25, 0x63,
+	0xf8, 0x14, 0xa6, 0xa3, 0x11, 0x5c, 0xf8, 0x0c, 0x5c, 0x19, 0x58, 0x5b, 0xf5, 0xba, 0xd7, 0x46,
+	0x4e, 0x70, 0x8c, 0xd5, 0x06, 0xd3, 0xd4, 0xbb, 0x1d, 0x6d, 0x7d, 0x58, 0x93, 0xe1, 0x8c, 0x88,
+	0x02, 0x75, 0x34, 0x92, 0x0f, 0x7f, 0x08, 0xd6, 0x46, 0xd9, 0xed, 0x76, 0xa0, 0x7a, 0x4c, 0x5a,
+	0xfa, 0x81, 0x33, 0x46, 0xda, 0x20, 0xed, 0x40, 0x47, 0xe3, 0x64, 0xe8, 0x60, 0xd1, 0x77, 0xd9,
+	0xed, 0xa0, 0xd4, 0x8c, 0xd5, 0x1f, 0x31, 0x65, 0x29, 0xa5, 0x92, 0x32, 0x69, 0x07, 0x46, 0xd8,
+	0x8c, 0x75, 0x94, 0x66, 0x0d, 0xd2, 0xc2, 0xdb, 0x59, 0xcc, 0xe7, 0x93, 0xa9, 0xc4, 0xb0, 0xcb,
+	0x75, 0x78, 0x23, 0x8c, 0xfb, 0x69, 0x11, 0x04, 0xf8, 0x21, 0x98, 0xe5, 0x86, 0xa7, 0xe5, 0x0a,
+	0x1f, 0x4b, 0xa6, 0xe4, 0x91, 0x4e, 0xb0, 0x5f, 0xd2, 0xaf, 0x0f, 0x80, 0xfa, 0x8f, 0x15, 0x70,
+	0x19, 0xe1, 0x97, 0x2d, 0x1c, 0x13, 0xb8, 0x0d, 0x66, 0x4b, 0x4d, 0x1c, 0x39, 0xc4, 0x0b, 0x03,
+	0xd6, 0x59, 0x16, 0xef, 0x66, 0xc5, 0x2c, 0xd1, 0xb7, 0xa3, 0x01, 0x04, 0xde, 0xee, 0x0d, 0xa3,
+	0x2a, 0x1f, 0x3c, 0x16, 0x04, 0x98, 0x1b, 0x51, 0x6f, 0x52, 0xbd, 0xdd, 0x6b, 0x5f, 0xec, 0xdf,
+	0x54, 0x06, 0x30, 0x6e, 0x44, 0xc2, 0xa9, 0xbb, 0x60, 0x06, 0xe1, 0xb8, 0x19, 0x06, 0x31, 0x86,
+	0x2a, 0xb8, 0x5c, 0x69, 0xb9, 0x2e, 0x8e, 0x63, 0xb6, 0x8f, 0x19, 0xd4, 0x5b, 0xc2, 0xab, 0x60,
+	0x9a, 0xfe, 0xe0, 0x68, 0xc5, 0xbc, 0x79, 0x21, 0xb1, 0x92, 0xf6, 0x92, 0xb9, 0x60, 0x2f, 0x5b,
+	0x7f, 0x51, 0xa4, 0x33, 0xc2, 0x45, 0x00, 0x8a, 0x21, 0xa9, 0x10, 0x27, 0x22, 0xb8, 0x96, 0x9d,
+	0x80, 0x57, 0x40, 0x56, 0x4c, 0xdd, 0xcc, 0x46, 0x27, 0xa5, 0xac, 0x02, 0x97, 0xc0, 0x1c, 0xc2,
+	0x71, 0xdf, 0x30, 0x09, 0xe7, 0xc1, 0xcc, 0xbe, 0xe7, 0xfb, 0x6c, 0x95, 0xa1, 0x6e, 0x5a, 0x30,
+	0x72, 0x91, 0xdb, 0xf0, 0xce, 0x70, 0xf6, 0x12, 0x55, 0xd9, 0xc5, 0x31, 0x89, 0xc2, 0x73, 0x8a,
+	0x60, 0xd3, 0x73, 0x76, 0x0a, 0x5e, 0x03, 0xab, 0x3b, 0xbe, 0xe3, 0x9e, 0x34, 0x42, 0x9f, 0xfd,
+	0x4a, 0x2e, 0x87, 0x11, 0xb1, 0xdb, 0xa8, 0x9d, 0xad, 0xc1, 0x1b, 0x60, 0xed, 0x30, 0x38, 0x1a,
+	0xe9, 0xc4, 0x70, 0x15, 0x2c, 0xb3, 0xb2, 0x98, 0x30, 0xd7, 0xe1, 0x1a, 0x58, 0x39, 0x0c, 0x6a,
+	0x43, 0x8e, 0xe3, 0xad, 0x7f, 0xcc, 0xf0, 0xfd, 0x88, 0x8a, 0x4c, 0xf9, 0xfb, 0x05, 0xcb, 0xaa,
+	0x96, 0x8a, 0x66, 0xf5, 0x71, 0xc9, 0xb2, 0x4a, 0xcf, 0x4d, 0x94, 0x9d, 0x80, 0xdf, 0x02, 0x9b,
+	0x43, 0xe6, 0xea, 0x61, 0xd1, 0x2e, 0x58, 0x55, 0x1b, 0x15, 0x9e, 0x3c, 0x31, 0x51, 0xb5, 0x52,
+	0xcc, 0x95, 0x2b, 0x7b, 0x25, 0x9b, 0x87, 0x80, 0xa1, 0x2d, 0x33, 0xb7, 0x6b, 0xa2, 0xec, 0x24,
+	0x7c, 0x1f, 0xe8, 0x92, 0x61, 0x1c, 0x31, 0xd3, 0x27, 0x3e, 0x3d, 0x2c, 0xa1, 0xc3, 0x83, 0xec,
+	0x25, 0x16, 0x3b, 0x6a, 0xc8, 0x59, 0x56, 0x76, 0x0a, 0x6e, 0x81, 0xf7, 0x77, 0xac, 0x5c, 0x7e,
+	0x7f, 0xaf, 0x64, 0x99, 0xd5, 0xb2, 0x69, 0xa2, 0x6a, 0xb9, 0x84, 0xec, 0xaa, 0xfd, 0xa2, 0x8a,
+	0x5e, 0x24, 0x77, 0x5c, 0x83, 0x39, 0xf0, 0xc9, 0xdb, 0x61, 0xc7, 0xed, 0x06, 0xc3, 0xf7, 0xc0,
+	0xc6, 0x78, 0x09, 0x71, 0xb6, 0x3a, 0xfc, 0x08, 0x7c, 0xef, 0x4d, 0xa8, 0x71, 0x9f, 0x38, 0xbe,
+	0xf8, 0x13, 0x22, 0x0a, 0x0d, 0x78, 0x13, 0xbc, 0x3b, 0x1e, 0x45, 0x43, 0xe3, 0xc1, 0xff, 0x03,
+	0xfa, 0xae, 0x69, 0xe5, 0x3e, 0xbb, 0x38, 0x2c, 0xaf, 0x14, 0xb8, 0x0d, 0x3e, 0x40, 0xb9, 0xe2,
+	0x6e, 0xe9, 0xa0, 0xfa, 0x16, 0xf8, 0xaf, 0x14, 0xf8, 0x29, 0xb8, 0xff, 0x66, 0xe0, 0xb8, 0x03,
+	0x7e, 0xad, 0x40, 0x13, 0x3c, 0x7a, 0xeb, 0xef, 0x8d, 0x93, 0xf9, 0xb5, 0x02, 0x6f, 0x82, 0x77,
+	0x46, 0xf3, 0x45, 0x1e, 0x7e, 0xa3, 0xc0, 0x4d, 0x70, 0xeb, 0xc2, 0x2f, 0x09, 0xe4, 0x6f, 0x15,
+	0xf8, 0x7d, 0x70, 0xef, 0x22, 0xc8, 0xb8, 0x6d, 0xfc, 0x4e, 0x81, 0x0f, 0xc1, 0x83, 0xb7, 0xf8,
+	0xc6, 0x38, 0x81, 0xdf, 0x5f, 0x70, 0x0e, 0x91, 0xec, 0x6f, 0xde, 0x7c, 0x0e, 0x81, 0xfc, 0x83,
+	0x02, 0xd7, 0xc1, 0xb5, 0xd1, 0x10, 0x7a, 0x27, 0xfe, 0xa8, 0xc0, 0xdb, 0x60, 0xe3, 0x42, 0x25,
+	0x0a, 0xfb, 0x93, 0x02, 0x55, 0xb0, 0x52, 0x2c, 0x55, 0x1f, 0xe7, 0x0a, 0x56, 0xf5, 0x79, 0xc1,
+	0xde, 0xab, 0x56, 0x6c, 0x64, 0x56, 0x2a, 0xd9, 0x5f, 0x4e, 0xd2, 0xad, 0x24, 0x3c, 0xc5, 0x92,
+	0x70, 0x56, 0x1f, 0x97, 0x50, 0xd5, 0x2a, 0x3c, 0x33, 0x8b, 0x14, 0xf9, 0xe5, 0x24, 0x5c, 0x02,
+	0x80, 0xc2, 0xca, 0xa5, 0x42, 0xd1, 0xae, 0x64, 0x7f, 0x92, 0x81, 0x0b, 0x60, 0xc6, 0x7c, 0x61,
+	0x9b, 0xa8, 0x98, 0xb3, 0xb2, 0xff, 0xcc, 0x6c, 0x85, 0x00, 0x0c, 0xc6, 0x0a, 0x38, 0x0d, 0x26,
+	0xf7, 0x9f, 0x65, 0x27, 0xe0, 0x2c, 0x98, 0xb2, 0xcc, 0x5c, 0xc5, 0xcc, 0x2a, 0x70, 0x05, 0x2c,
+	0x99, 0x96, 0x99, 0xb7, 0x0b, 0xa5, 0x62, 0x15, 0x1d, 0x16, 0x8b, 0xac, 0x6e, 0x64, 0xc1, 0xfc,
+	0xf3, 0x9c, 0x9d, 0xdf, 0xeb, 0x59, 0x32, 0xb4, 0x3e, 0x59, 0xa5, 0xfc, 0x7e, 0x15, 0xe5, 0xf2,
+	0x26, 0xea, 0x99, 0x2f, 0x51, 0x20, 0x13, 0xea, 0x59, 0xa6, 0xee, 0x3e, 0x04, 0xb3, 0x76, 0xe4,
+	0x04, 0x71, 0x33, 0x8c, 0x08, 0xbc, 0x2b, 0x2f, 0x16, 0x45, 0xad, 0x17, 0x7d, 0xec, 0xfa, 0x52,
+	0x7f, 0xcd, 0xdb, 0x89, 0x3e, 0xb1, 0xa9, 0x7c, 0x5b, 0xd9, 0xb9, 0xf2, 0xea, 0x6f, 0xeb, 0x13,
+	0xaf, 0x5e, 0xaf, 0x2b, 0xdf, 0xbc, 0x5e, 0x57, 0xfe, 0xfa, 0x7a, 0x5d, 0xf9, 0xc5, 0xdf, 0xd7,
+	0x27, 0x8e, 0xa6, 0xd9, 0xff, 0x2a, 0xdc, 0xfb, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x90,
+	0x3a, 0xc0, 0x9e, 0x18, 0x00, 0x00,
 }

tools/functional-tester/rpcpb/rpc.proto

@@ -89,19 +89,17 @@ message Member {
   // EtcdLogPath is the log file to store current etcd server logs.
   string EtcdLogPath = 102 [(gogoproto.moretags) = "yaml:\"etcd-log-path\""];
 
-  // EtcdClientTLS is true when client traffic needs to be encrypted.
-  bool EtcdClientTLS = 201 [(gogoproto.moretags) = "yaml:\"etcd-client-tls\""];
   // EtcdClientProxy is true when client traffic needs to be proxied.
   // If true, listen client URL port must be different than advertise client URL port.
-  bool EtcdClientProxy = 202 [(gogoproto.moretags) = "yaml:\"etcd-client-proxy\""];
+  bool EtcdClientProxy = 201 [(gogoproto.moretags) = "yaml:\"etcd-client-proxy\""];
   // EtcdPeerProxy is true when peer traffic needs to be proxied.
   // If true, listen peer URL port must be different than advertise peer URL port.
-  bool EtcdPeerProxy = 203 [(gogoproto.moretags) = "yaml:\"etcd-peer-proxy\""];
-  // EtcdClientEndpoint is the etcd client endpoint.
-  string EtcdClientEndpoint = 204 [(gogoproto.moretags) = "yaml:\"etcd-client-endpoint\""];
+  bool EtcdPeerProxy = 202 [(gogoproto.moretags) = "yaml:\"etcd-peer-proxy\""];
 
+  // EtcdClientEndpoint is the etcd client endpoint.
+  string EtcdClientEndpoint = 301 [(gogoproto.moretags) = "yaml:\"etcd-client-endpoint\""];
   // Etcd defines etcd binary configuration flags.
-  Etcd Etcd = 301 [(gogoproto.moretags) = "yaml:\"etcd\""];
+  Etcd Etcd = 302 [(gogoproto.moretags) = "yaml:\"etcd\""];
 
   // ClientCertData contains cert file contents from this member's etcd server.
   string ClientCertData = 401 [(gogoproto.moretags) = "yaml:\"client-cert-data\""];