Browse Source

functional-tester/rpcpb: rename "AdvertisePeerURLs", add more tests

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 7 years ago
parent
commit
09a4e059c5

+ 1 - 1
tools/functional-tester/rpcpb/etcd_config.go

@@ -37,7 +37,7 @@ var etcdFields = []string{
 	"ClientTrustedCAFile",
 
 	"ListenPeerURLs",
-	"InitialAdvertisePeerURLs",
+	"AdvertisePeerURLs",
 	"PeerAutoTLS",
 	"PeerClientCertAuth",
 	"PeerCertFile",

+ 15 - 15
tools/functional-tester/rpcpb/etcd_config_test.go

@@ -28,23 +28,23 @@ func TestEtcdFlags(t *testing.T) {
 		HeartbeatIntervalMs: 100,
 		ElectionTimeoutMs:   1000,
 
-		ListenClientURLs:    []string{"127.0.0.1:1379"},
-		AdvertiseClientURLs: []string{"127.0.0.1:13790"},
+		ListenClientURLs:    []string{"https://127.0.0.1:1379"},
+		AdvertiseClientURLs: []string{"https://127.0.0.1:13790"},
 		ClientAutoTLS:       true,
 		ClientCertAuth:      false,
 		ClientCertFile:      "",
 		ClientKeyFile:       "",
 		ClientTrustedCAFile: "",
 
-		ListenPeerURLs:           []string{"127.0.0.1:1380"},
-		InitialAdvertisePeerURLs: []string{"127.0.0.1:13800"},
-		PeerAutoTLS:              true,
-		PeerClientCertAuth:       false,
-		PeerCertFile:             "",
-		PeerKeyFile:              "",
-		PeerTrustedCAFile:        "",
+		ListenPeerURLs:     []string{"https://127.0.0.1:1380"},
+		AdvertisePeerURLs:  []string{"https://127.0.0.1:13800"},
+		PeerAutoTLS:        true,
+		PeerClientCertAuth: false,
+		PeerCertFile:       "",
+		PeerKeyFile:        "",
+		PeerTrustedCAFile:  "",
 
-		InitialCluster:      "s1=127.0.0.1:13800,s2=127.0.0.1:23800,s3=127.0.0.1:33800",
+		InitialCluster:      "s1=https://127.0.0.1:13800,s2=https://127.0.0.1:23800,s3=https://127.0.0.1:33800",
 		InitialClusterState: "new",
 		InitialClusterToken: "tkn",
 
@@ -61,15 +61,15 @@ func TestEtcdFlags(t *testing.T) {
 		"--wal-dir=/tmp/etcd-agent-data-1/etcd.data/member/wal",
 		"--heartbeat-interval=100",
 		"--election-timeout=1000",
-		"--listen-client-urls=127.0.0.1:1379",
-		"--advertise-client-urls=127.0.0.1:13790",
+		"--listen-client-urls=https://127.0.0.1:1379",
+		"--advertise-client-urls=https://127.0.0.1:13790",
 		"--auto-tls=true",
 		"--client-cert-auth=false",
-		"--listen-peer-urls=127.0.0.1:1380",
-		"--initial-advertise-peer-urls=127.0.0.1:13800",
+		"--listen-peer-urls=https://127.0.0.1:1380",
+		"--initial-advertise-peer-urls=https://127.0.0.1:13800",
 		"--peer-auto-tls=true",
 		"--peer-client-cert-auth=false",
-		"--initial-cluster=s1=127.0.0.1:13800,s2=127.0.0.1:23800,s3=127.0.0.1:33800",
+		"--initial-cluster=s1=https://127.0.0.1:13800,s2=https://127.0.0.1:23800,s3=https://127.0.0.1:33800",
 		"--initial-cluster-state=new",
 		"--initial-cluster-token=tkn",
 		"--snapshot-count=10000",

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

@@ -234,28 +234,28 @@ type Etcd struct {
 	HeartbeatIntervalMs int64 `protobuf:"varint,11,opt,name=HeartbeatIntervalMs,proto3" json:"HeartbeatIntervalMs,omitempty" yaml:"heartbeat-interval"`
 	// ElectionTimeoutMs is the time (in milliseconds) for an election to timeout.
 	// Default value is 1000, which is 1s.
-	ElectionTimeoutMs        int64    `protobuf:"varint,12,opt,name=ElectionTimeoutMs,proto3" json:"ElectionTimeoutMs,omitempty" yaml:"election-timeout"`
-	ListenClientURLs         []string `protobuf:"bytes,21,rep,name=ListenClientURLs" json:"ListenClientURLs,omitempty" yaml:"listen-client-urls"`
-	AdvertiseClientURLs      []string `protobuf:"bytes,22,rep,name=AdvertiseClientURLs" json:"AdvertiseClientURLs,omitempty" yaml:"advertise-client-urls"`
-	ClientAutoTLS            bool     `protobuf:"varint,23,opt,name=ClientAutoTLS,proto3" json:"ClientAutoTLS,omitempty" yaml:"auto-tls"`
-	ClientCertAuth           bool     `protobuf:"varint,24,opt,name=ClientCertAuth,proto3" json:"ClientCertAuth,omitempty" yaml:"client-cert-auth"`
-	ClientCertFile           string   `protobuf:"bytes,25,opt,name=ClientCertFile,proto3" json:"ClientCertFile,omitempty" yaml:"cert-file"`
-	ClientKeyFile            string   `protobuf:"bytes,26,opt,name=ClientKeyFile,proto3" json:"ClientKeyFile,omitempty" yaml:"key-file"`
-	ClientTrustedCAFile      string   `protobuf:"bytes,27,opt,name=ClientTrustedCAFile,proto3" json:"ClientTrustedCAFile,omitempty" yaml:"trusted-ca-file"`
-	ListenPeerURLs           []string `protobuf:"bytes,31,rep,name=ListenPeerURLs" json:"ListenPeerURLs,omitempty" yaml:"listen-peer-urls"`
-	InitialAdvertisePeerURLs []string `protobuf:"bytes,32,rep,name=InitialAdvertisePeerURLs" json:"InitialAdvertisePeerURLs,omitempty" yaml:"initial-advertise-peer-urls"`
-	PeerAutoTLS              bool     `protobuf:"varint,33,opt,name=PeerAutoTLS,proto3" json:"PeerAutoTLS,omitempty" yaml:"peer-auto-tls"`
-	PeerClientCertAuth       bool     `protobuf:"varint,34,opt,name=PeerClientCertAuth,proto3" json:"PeerClientCertAuth,omitempty" yaml:"peer-client-cert-auth"`
-	PeerCertFile             string   `protobuf:"bytes,35,opt,name=PeerCertFile,proto3" json:"PeerCertFile,omitempty" yaml:"peer-cert-file"`
-	PeerKeyFile              string   `protobuf:"bytes,36,opt,name=PeerKeyFile,proto3" json:"PeerKeyFile,omitempty" yaml:"peer-key-file"`
-	PeerTrustedCAFile        string   `protobuf:"bytes,37,opt,name=PeerTrustedCAFile,proto3" json:"PeerTrustedCAFile,omitempty" yaml:"peer-trusted-ca-file"`
-	InitialCluster           string   `protobuf:"bytes,41,opt,name=InitialCluster,proto3" json:"InitialCluster,omitempty" yaml:"initial-cluster"`
-	InitialClusterState      string   `protobuf:"bytes,42,opt,name=InitialClusterState,proto3" json:"InitialClusterState,omitempty" yaml:"initial-cluster-state"`
-	InitialClusterToken      string   `protobuf:"bytes,43,opt,name=InitialClusterToken,proto3" json:"InitialClusterToken,omitempty" yaml:"initial-cluster-token"`
-	SnapshotCount            int64    `protobuf:"varint,51,opt,name=SnapshotCount,proto3" json:"SnapshotCount,omitempty" yaml:"snapshot-count"`
-	QuotaBackendBytes        int64    `protobuf:"varint,52,opt,name=QuotaBackendBytes,proto3" json:"QuotaBackendBytes,omitempty" yaml:"quota-backend-bytes"`
-	PreVote                  bool     `protobuf:"varint,63,opt,name=PreVote,proto3" json:"PreVote,omitempty" yaml:"pre-vote"`
-	InitialCorruptCheck      bool     `protobuf:"varint,64,opt,name=InitialCorruptCheck,proto3" json:"InitialCorruptCheck,omitempty" yaml:"initial-corrupt-check"`
+	ElectionTimeoutMs   int64    `protobuf:"varint,12,opt,name=ElectionTimeoutMs,proto3" json:"ElectionTimeoutMs,omitempty" yaml:"election-timeout"`
+	ListenClientURLs    []string `protobuf:"bytes,21,rep,name=ListenClientURLs" json:"ListenClientURLs,omitempty" yaml:"listen-client-urls"`
+	AdvertiseClientURLs []string `protobuf:"bytes,22,rep,name=AdvertiseClientURLs" json:"AdvertiseClientURLs,omitempty" yaml:"advertise-client-urls"`
+	ClientAutoTLS       bool     `protobuf:"varint,23,opt,name=ClientAutoTLS,proto3" json:"ClientAutoTLS,omitempty" yaml:"auto-tls"`
+	ClientCertAuth      bool     `protobuf:"varint,24,opt,name=ClientCertAuth,proto3" json:"ClientCertAuth,omitempty" yaml:"client-cert-auth"`
+	ClientCertFile      string   `protobuf:"bytes,25,opt,name=ClientCertFile,proto3" json:"ClientCertFile,omitempty" yaml:"cert-file"`
+	ClientKeyFile       string   `protobuf:"bytes,26,opt,name=ClientKeyFile,proto3" json:"ClientKeyFile,omitempty" yaml:"key-file"`
+	ClientTrustedCAFile string   `protobuf:"bytes,27,opt,name=ClientTrustedCAFile,proto3" json:"ClientTrustedCAFile,omitempty" yaml:"trusted-ca-file"`
+	ListenPeerURLs      []string `protobuf:"bytes,31,rep,name=ListenPeerURLs" json:"ListenPeerURLs,omitempty" yaml:"listen-peer-urls"`
+	AdvertisePeerURLs   []string `protobuf:"bytes,32,rep,name=AdvertisePeerURLs" json:"AdvertisePeerURLs,omitempty" yaml:"initial-advertise-peer-urls"`
+	PeerAutoTLS         bool     `protobuf:"varint,33,opt,name=PeerAutoTLS,proto3" json:"PeerAutoTLS,omitempty" yaml:"peer-auto-tls"`
+	PeerClientCertAuth  bool     `protobuf:"varint,34,opt,name=PeerClientCertAuth,proto3" json:"PeerClientCertAuth,omitempty" yaml:"peer-client-cert-auth"`
+	PeerCertFile        string   `protobuf:"bytes,35,opt,name=PeerCertFile,proto3" json:"PeerCertFile,omitempty" yaml:"peer-cert-file"`
+	PeerKeyFile         string   `protobuf:"bytes,36,opt,name=PeerKeyFile,proto3" json:"PeerKeyFile,omitempty" yaml:"peer-key-file"`
+	PeerTrustedCAFile   string   `protobuf:"bytes,37,opt,name=PeerTrustedCAFile,proto3" json:"PeerTrustedCAFile,omitempty" yaml:"peer-trusted-ca-file"`
+	InitialCluster      string   `protobuf:"bytes,41,opt,name=InitialCluster,proto3" json:"InitialCluster,omitempty" yaml:"initial-cluster"`
+	InitialClusterState string   `protobuf:"bytes,42,opt,name=InitialClusterState,proto3" json:"InitialClusterState,omitempty" yaml:"initial-cluster-state"`
+	InitialClusterToken string   `protobuf:"bytes,43,opt,name=InitialClusterToken,proto3" json:"InitialClusterToken,omitempty" yaml:"initial-cluster-token"`
+	SnapshotCount       int64    `protobuf:"varint,51,opt,name=SnapshotCount,proto3" json:"SnapshotCount,omitempty" yaml:"snapshot-count"`
+	QuotaBackendBytes   int64    `protobuf:"varint,52,opt,name=QuotaBackendBytes,proto3" json:"QuotaBackendBytes,omitempty" yaml:"quota-backend-bytes"`
+	PreVote             bool     `protobuf:"varint,63,opt,name=PreVote,proto3" json:"PreVote,omitempty" yaml:"pre-vote"`
+	InitialCorruptCheck bool     `protobuf:"varint,64,opt,name=InitialCorruptCheck,proto3" json:"InitialCorruptCheck,omitempty" yaml:"initial-corrupt-check"`
 }
 
 func (m *Etcd) Reset()                    { *m = Etcd{} }
@@ -632,8 +632,8 @@ func (m *Etcd) MarshalTo(dAtA []byte) (int, error) {
 			i += copy(dAtA[i:], s)
 		}
 	}
-	if len(m.InitialAdvertisePeerURLs) > 0 {
-		for _, s := range m.InitialAdvertisePeerURLs {
+	if len(m.AdvertisePeerURLs) > 0 {
+		for _, s := range m.AdvertisePeerURLs {
 			dAtA[i] = 0x82
 			i++
 			dAtA[i] = 0x2
@@ -1236,8 +1236,8 @@ func (m *Etcd) Size() (n int) {
 			n += 2 + l + sovRpc(uint64(l))
 		}
 	}
-	if len(m.InitialAdvertisePeerURLs) > 0 {
-		for _, s := range m.InitialAdvertisePeerURLs {
+	if len(m.AdvertisePeerURLs) > 0 {
+		for _, s := range m.AdvertisePeerURLs {
 			l = len(s)
 			n += 2 + l + sovRpc(uint64(l))
 		}
@@ -1831,7 +1831,7 @@ func (m *Etcd) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 32:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field InitialAdvertisePeerURLs", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field AdvertisePeerURLs", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -1856,7 +1856,7 @@ func (m *Etcd) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.InitialAdvertisePeerURLs = append(m.InitialAdvertisePeerURLs, string(dAtA[iNdEx:postIndex]))
+			m.AdvertisePeerURLs = append(m.AdvertisePeerURLs, string(dAtA[iNdEx:postIndex]))
 			iNdEx = postIndex
 		case 33:
 			if wireType != 0 {
@@ -3391,149 +3391,149 @@ var (
 func init() { proto.RegisterFile("rpcpb/rpc.proto", fileDescriptorRpc) }
 
 var fileDescriptorRpc = []byte{
-	// 2292 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x58, 0xdd, 0x56, 0xdb, 0xd8,
-	0xf5, 0x47, 0x10, 0x18, 0x38, 0x7c, 0x39, 0x87, 0x10, 0x94, 0x64, 0x06, 0x11, 0x65, 0x92, 0x3f,
-	0xc3, 0xbf, 0x22, 0x6d, 0x32, 0xab, 0x6d, 0xd2, 0x4c, 0x13, 0x63, 0x94, 0xe0, 0x22, 0x6c, 0xe7,
-	0x58, 0x24, 0x99, 0x2b, 0x57, 0x96, 0x8f, 0xb1, 0x8a, 0x90, 0x1c, 0xe9, 0x98, 0x31, 0xf3, 0x02,
-	0xb3, 0x7a, 0xd7, 0xcb, 0x3e, 0x44, 0xe7, 0x3d, 0x32, 0x1f, 0x6d, 0xa7, 0xed, 0x5d, 0x2f, 0xdc,
-	0x36, 0x5d, 0x7d, 0x01, 0xaf, 0x3e, 0x40, 0xd7, 0xf9, 0x10, 0x3e, 0x92, 0x6d, 0x92, 0x3b, 0xb4,
-	0xf7, 0xef, 0xf7, 0xd3, 0x39, 0x7b, 0x6f, 0xed, 0xbd, 0x0d, 0x58, 0x8e, 0xda, 0x6e, 0xbb, 0x7e,
-	0x37, 0x6a, 0xbb, 0xdb, 0xed, 0x28, 0x24, 0x21, 0x9c, 0x66, 0x86, 0xeb, 0xc6, 0x91, 0x47, 0x5a,
-	0x9d, 0xfa, 0xb6, 0x1b, 0x9e, 0xdc, 0x3d, 0x0a, 0x8f, 0xc2, 0xbb, 0xcc, 0x5b, 0xef, 0x34, 0xd9,
-	0x13, 0x7b, 0x60, 0x7f, 0x71, 0x96, 0xfe, 0xd5, 0x12, 0xb8, 0x64, 0x12, 0xb7, 0x01, 0x6f, 0x81,
-	0x4b, 0x25, 0xe7, 0x04, 0xab, 0xca, 0x86, 0xb2, 0x39, 0xb7, 0xb3, 0xdc, 0xef, 0x69, 0xf3, 0x67,
-	0xce, 0x89, 0xff, 0x50, 0x0f, 0x9c, 0x13, 0xac, 0x23, 0xe6, 0x84, 0x06, 0xf8, 0x60, 0xd7, 0x21,
-	0xce, 0xae, 0x17, 0xa9, 0x93, 0x0c, 0xb7, 0xd2, 0xef, 0x69, 0xcb, 0x1c, 0xd7, 0x70, 0x88, 0x63,
-	0x34, 0xbc, 0x48, 0x47, 0x09, 0x06, 0x6e, 0x81, 0x99, 0x97, 0x79, 0x8b, 0xa2, 0xa7, 0x18, 0x1a,
-	0xf6, 0x7b, 0xda, 0x12, 0x47, 0x7f, 0xe1, 0xf8, 0x1c, 0x2c, 0x10, 0xb0, 0x0c, 0x56, 0xf6, 0xb0,
-	0x13, 0x91, 0x3a, 0x76, 0x48, 0x31, 0x20, 0x38, 0x3a, 0x75, 0xfc, 0x83, 0x58, 0x9d, 0xdf, 0x50,
-	0x36, 0xa7, 0x76, 0x3e, 0xea, 0xf7, 0xb4, 0x6b, 0x9c, 0xd8, 0x4a, 0x40, 0x86, 0x27, 0x50, 0x3a,
-	0x1a, 0xc5, 0x84, 0x45, 0x70, 0xd9, 0xf4, 0xb1, 0x4b, 0xbc, 0x30, 0xb0, 0xbd, 0x13, 0x1c, 0x76,
-	0xc8, 0x41, 0xac, 0x2e, 0x30, 0xb9, 0x1b, 0xfd, 0x9e, 0xb6, 0xc6, 0xe5, 0xb0, 0x80, 0x18, 0x84,
-	0x63, 0x74, 0x34, 0xcc, 0x82, 0x45, 0x90, 0xb3, 0xbc, 0x98, 0xe0, 0xa0, 0xe0, 0x7b, 0x38, 0x20,
-	0x87, 0xc8, 0x8a, 0xd5, 0xd5, 0x8d, 0xa9, 0xcd, 0x39, 0xf9, 0x60, 0x3e, 0x43, 0x18, 0x2e, 0x83,
-	0x18, 0x9d, 0xc8, 0x8f, 0x75, 0x34, 0x44, 0x83, 0x08, 0xac, 0xe4, 0x1b, 0xa7, 0x38, 0x22, 0x5e,
-	0x8c, 0x25, 0xb5, 0xab, 0x4c, 0x6d, 0xa3, 0xdf, 0xd3, 0x3e, 0xe4, 0x6a, 0x4e, 0x02, 0x4a, 0x0b,
-	0x8e, 0x22, 0xc3, 0x07, 0x60, 0x91, 0x3f, 0xe5, 0x3b, 0x24, 0xb4, 0xad, 0xaa, 0xba, 0xb6, 0xa1,
-	0x6c, 0xce, 0xca, 0xb9, 0x71, 0x3a, 0x24, 0x34, 0x08, 0x15, 0x48, 0x23, 0x61, 0x01, 0x2c, 0x71,
-	0x43, 0x01, 0x47, 0xd4, 0xd8, 0x52, 0x55, 0xc6, 0x95, 0x22, 0x24, 0xde, 0xef, 0xe2, 0x88, 0x18,
-	0x4e, 0x87, 0xb4, 0x74, 0x94, 0xa1, 0xc0, 0x47, 0xb2, 0xc8, 0x53, 0xcf, 0xc7, 0xea, 0x35, 0x96,
-	0xee, 0x2b, 0xfd, 0x9e, 0x96, 0x13, 0x22, 0x94, 0xdd, 0xf4, 0x7c, 0x9c, 0x62, 0x53, 0xec, 0xe0,
-	0xf4, 0xfb, 0xf8, 0x8c, 0x91, 0xaf, 0x67, 0x2b, 0xeb, 0x18, 0x9f, 0x09, 0x6e, 0x1a, 0x09, 0x2d,
-	0xb0, 0xc2, 0x0d, 0x76, 0xd4, 0x89, 0x09, 0x6e, 0x14, 0xf2, 0x4c, 0xe0, 0x06, 0x13, 0xb8, 0xde,
-	0xef, 0x69, 0x57, 0xb9, 0x00, 0xe1, 0x6e, 0xc3, 0x75, 0x84, 0xce, 0x28, 0x1a, 0x8d, 0x05, 0x4f,
-	0x57, 0x05, 0xe3, 0x88, 0x65, 0x45, 0x63, 0x59, 0x91, 0x62, 0x21, 0x72, 0xdc, 0xc6, 0x38, 0x12,
-	0x09, 0xc9, 0x50, 0x60, 0x1d, 0xa8, 0xc5, 0xc0, 0x23, 0x9e, 0xe3, 0x9f, 0x67, 0xea, 0x5c, 0x6e,
-	0x83, 0xc9, 0xdd, 0xe9, 0xf7, 0x34, 0x9d, 0xcb, 0x79, 0x1c, 0x69, 0x0c, 0x92, 0x2d, 0x29, 0x8f,
-	0xd5, 0x81, 0x0f, 0xc1, 0x3c, 0xfd, 0x3b, 0xc9, 0xf6, 0x4d, 0x96, 0x31, 0xb5, 0xdf, 0xd3, 0xae,
-	0x70, 0x59, 0x26, 0x32, 0x48, 0xb9, 0x0c, 0x86, 0x15, 0x00, 0xe9, 0x63, 0x26, 0xe9, 0x3a, 0x93,
-	0x90, 0xca, 0x8f, 0x49, 0x0c, 0x67, 0x7e, 0x04, 0x17, 0x7e, 0x06, 0x16, 0x98, 0x35, 0xc9, 0xfd,
-	0x2d, 0x16, 0xfd, 0x6b, 0xfd, 0x9e, 0xb6, 0x2a, 0x6b, 0x0d, 0x0a, 0x20, 0x05, 0x4f, 0x2e, 0x93,
-	0x24, 0xff, 0x63, 0xc6, 0xce, 0x5e, 0x66, 0x50, 0x01, 0x32, 0x18, 0x1e, 0x80, 0xcb, 0xf4, 0x31,
-	0x9d, 0xfd, 0xdb, 0x4c, 0x41, 0xeb, 0xf7, 0xb4, 0x1b, 0x92, 0xc2, 0x50, 0x09, 0x0c, 0x33, 0xe1,
-	0x0e, 0x58, 0x12, 0x31, 0x2f, 0xf8, 0xd4, 0x1e, 0xa9, 0x9f, 0x64, 0x2b, 0x29, 0xc9, 0x98, 0xcb,
-	0x01, 0x3a, 0xca, 0x30, 0xe8, 0xf7, 0x9d, 0xb6, 0x54, 0x89, 0x43, 0xb0, 0xba, 0xc5, 0x84, 0xa4,
-	0x00, 0x67, 0x84, 0x8c, 0x98, 0xc2, 0x74, 0x34, 0x8a, 0x3c, 0xac, 0x69, 0x87, 0xc7, 0x38, 0x50,
-	0xff, 0xff, 0x5d, 0x9a, 0x84, 0xc2, 0x86, 0x34, 0x19, 0x19, 0x3e, 0x06, 0x8b, 0xd5, 0xc0, 0x69,
-	0xc7, 0xad, 0x90, 0x14, 0xc2, 0x4e, 0x40, 0xd4, 0xfb, 0xac, 0x33, 0x4a, 0x69, 0x8b, 0x85, 0xdb,
-	0x70, 0xa9, 0x5f, 0x47, 0x69, 0x3c, 0xb4, 0xc0, 0xe5, 0xe7, 0x9d, 0x90, 0x38, 0x3b, 0x8e, 0x7b,
-	0x8c, 0x83, 0xc6, 0xce, 0x19, 0xc1, 0xb1, 0xfa, 0x29, 0x13, 0x59, 0xef, 0xf7, 0xb4, 0xeb, 0x5c,
-	0xe4, 0x35, 0x85, 0x18, 0x75, 0x8e, 0x31, 0xea, 0x14, 0xa4, 0xa3, 0x61, 0x22, 0x1d, 0x2c, 0x95,
-	0x08, 0xbf, 0x08, 0x09, 0x56, 0x1f, 0x67, 0x9b, 0x57, 0x3b, 0xc2, 0xc6, 0x69, 0x48, 0xa3, 0x93,
-	0x60, 0xe4, 0x88, 0x84, 0x51, 0xd4, 0x69, 0x93, 0x42, 0x0b, 0xbb, 0xc7, 0xea, 0x93, 0x6c, 0x19,
-	0x9f, 0x47, 0x84, 0xa3, 0x0c, 0x97, 0xc2, 0xa4, 0x88, 0x48, 0x64, 0xfd, 0xb7, 0xd3, 0x60, 0xe6,
-	0x00, 0x9f, 0xd4, 0x71, 0x44, 0x4b, 0x9a, 0xce, 0x44, 0xb3, 0x8b, 0xdd, 0x8a, 0x43, 0x5a, 0x62,
-	0x26, 0x4a, 0xb1, 0xc1, 0xc4, 0x6d, 0x18, 0xb8, 0x8b, 0x5d, 0xa3, 0xed, 0xd0, 0xef, 0x22, 0x05,
-	0x87, 0xf7, 0xc1, 0x5c, 0xfe, 0x88, 0x36, 0xd9, 0x46, 0x23, 0x62, 0x03, 0x6c, 0x6e, 0x67, 0xb5,
-	0xdf, 0xd3, 0x2e, 0x8b, 0x5e, 0x4c, 0x5d, 0x86, 0xd3, 0x68, 0x44, 0x3a, 0x1a, 0xe0, 0x68, 0x3c,
-	0x9f, 0x3a, 0x9e, 0xdf, 0x0e, 0xbd, 0x80, 0xec, 0xd9, 0x76, 0x85, 0x91, 0x17, 0x18, 0x59, 0x8a,
-	0x67, 0x33, 0x81, 0x18, 0x2d, 0x42, 0xda, 0x42, 0x65, 0x98, 0x48, 0xe3, 0xb9, 0xe3, 0xc4, 0x98,
-	0x8e, 0x5e, 0x9c, 0x6d, 0xa7, 0x75, 0x27, 0xc6, 0x62, 0x50, 0x0b, 0x0c, 0xfd, 0x08, 0xe9, 0x0d,
-	0xac, 0xf0, 0x88, 0xdd, 0xb7, 0x99, 0xfd, 0x08, 0xd9, 0x7d, 0xfd, 0xf0, 0x48, 0x5c, 0x57, 0x06,
-	0xc3, 0x3c, 0x58, 0xa4, 0x8f, 0xa2, 0xa3, 0x5a, 0x55, 0xf5, 0x1b, 0x85, 0xa5, 0x41, 0xfa, 0x6a,
-	0x18, 0x5d, 0x74, 0x13, 0x3e, 0x85, 0x52, 0x0c, 0xf8, 0x0c, 0x2c, 0x0f, 0x0c, 0x95, 0x28, 0xec,
-	0x9e, 0xa9, 0xdf, 0x72, 0x91, 0x0f, 0xfb, 0x3d, 0x4d, 0x1d, 0x16, 0x69, 0x53, 0x8c, 0x8e, 0xb2,
-	0xac, 0xe4, 0x2c, 0xf4, 0xd3, 0xe6, 0x32, 0xdf, 0x8d, 0x3e, 0x0b, 0x6b, 0x09, 0x42, 0x24, 0xcd,
-	0xa0, 0x0d, 0x72, 0xa0, 0x6a, 0x06, 0x0d, 0x16, 0x57, 0xf5, 0x7b, 0x25, 0xdb, 0x55, 0xe4, 0xe3,
-	0x60, 0x01, 0xd3, 0xd1, 0x08, 0x2e, 0xfc, 0x09, 0xdf, 0xb0, 0xd4, 0xaf, 0xe9, 0xca, 0x34, 0x7f,
-	0x6f, 0x7e, 0x9b, 0x2d, 0x6a, 0xdb, 0xd4, 0x26, 0xef, 0x59, 0x54, 0x50, 0x47, 0x0c, 0xaa, 0xff,
-	0x7d, 0x01, 0xcc, 0xd8, 0x98, 0x35, 0x94, 0xc7, 0x60, 0x91, 0xff, 0x55, 0xc2, 0xe4, 0x8b, 0x30,
-	0x3a, 0x1e, 0x2e, 0x46, 0xc2, 0xdc, 0x46, 0xc0, 0xfd, 0x3a, 0x4a, 0xe3, 0xe1, 0x4f, 0x01, 0xe0,
-	0x06, 0x56, 0x51, 0x7c, 0x6d, 0xbb, 0xda, 0xef, 0x69, 0x30, 0xc5, 0xe6, 0x95, 0x24, 0x21, 0xe9,
-	0x38, 0xdc, 0xc5, 0xbe, 0x73, 0x66, 0x39, 0x04, 0x07, 0xee, 0x99, 0xd8, 0xc5, 0x16, 0xe5, 0x71,
-	0xd8, 0xa0, 0x7e, 0xc3, 0xe7, 0x00, 0xe3, 0x84, 0x8e, 0xc3, 0x34, 0x05, 0xfe, 0x0a, 0xe4, 0xd2,
-	0x16, 0x74, 0xca, 0x8a, 0x7a, 0x51, 0x2e, 0xea, 0xac, 0x8c, 0x11, 0x9d, 0xea, 0x68, 0x88, 0x07,
-	0x3f, 0x07, 0xab, 0x87, 0xed, 0x86, 0x43, 0x70, 0x23, 0x73, 0xae, 0x45, 0x26, 0x78, 0xab, 0xdf,
-	0xd3, 0x34, 0x2e, 0xd8, 0xe1, 0x30, 0x63, 0xf8, 0x7c, 0xa3, 0x15, 0x68, 0x8c, 0x50, 0xd8, 0x09,
-	0x1a, 0x96, 0x77, 0xe2, 0x11, 0x75, 0x75, 0x43, 0xd9, 0x9c, 0x96, 0x63, 0x14, 0x51, 0x9f, 0xe1,
-	0x53, 0xa7, 0x8e, 0x24, 0x24, 0x7c, 0x02, 0x16, 0xcd, 0xae, 0x47, 0xca, 0x01, 0xfd, 0x02, 0x3b,
-	0x11, 0x56, 0xaf, 0x0e, 0x95, 0x5b, 0xd7, 0x23, 0x46, 0x18, 0x18, 0x4d, 0x0e, 0xa0, 0xe5, 0x26,
-	0x13, 0xe0, 0x1e, 0xc8, 0x15, 0xc2, 0x20, 0x66, 0x4b, 0x84, 0x7b, 0xc6, 0xdb, 0xd8, 0x5a, 0xb6,
-	0xf4, 0xdd, 0x01, 0x22, 0x69, 0x61, 0x43, 0x2c, 0xf8, 0x00, 0xcc, 0x9b, 0x81, 0x53, 0xf7, 0x71,
-	0xa5, 0x1d, 0x85, 0x4d, 0xb1, 0xc7, 0xad, 0xf5, 0x7b, 0xda, 0x8a, 0x38, 0x09, 0x73, 0x1a, 0x6d,
-	0xea, 0xa5, 0x9f, 0xf0, 0x00, 0x0b, 0x1f, 0x81, 0x05, 0x71, 0x9e, 0x82, 0x13, 0xe3, 0x64, 0xef,
-	0x91, 0xbe, 0x7f, 0x71, 0x7a, 0xc3, 0xa5, 0x6e, 0x1d, 0xa5, 0xd0, 0xb4, 0x50, 0xc4, 0x33, 0x8b,
-	0xea, 0x01, 0x5d, 0x74, 0x32, 0x85, 0x92, 0xf0, 0x79, 0x42, 0x58, 0xa1, 0xa4, 0x29, 0x74, 0xf6,
-	0x0a, 0x4b, 0xb5, 0xd5, 0x69, 0x36, 0x7d, 0x2c, 0xd6, 0x1a, 0x29, 0x94, 0x89, 0x48, 0xcc, 0x01,
-	0x03, 0x0d, 0xc1, 0x80, 0xfb, 0x52, 0x0b, 0x2d, 0x84, 0x27, 0x27, 0x4e, 0xd0, 0x88, 0x55, 0x3d,
-	0xbb, 0xa7, 0x0f, 0x5a, 0xa8, 0x2b, 0x30, 0x72, 0x07, 0x4d, 0x78, 0xf4, 0x56, 0xa8, 0x13, 0x04,
-	0x38, 0x3a, 0x9f, 0x02, 0x7c, 0x19, 0x90, 0x6e, 0x15, 0x31, 0xbf, 0x3c, 0x07, 0x32, 0x14, 0xfa,
-	0xc3, 0xc1, 0xec, 0x12, 0x1c, 0x05, 0x8e, 0x7f, 0x2e, 0xc3, 0x57, 0x01, 0xe9, 0x40, 0x58, 0x20,
-	0x64, 0xa1, 0x21, 0x1a, 0x4d, 0x6f, 0x95, 0x44, 0x38, 0x8e, 0xed, 0xb3, 0x36, 0x8e, 0x55, 0xcc,
-	0xae, 0x25, 0xa5, 0x37, 0x66, 0x4e, 0x83, 0x50, 0xaf, 0x8e, 0x64, 0x2c, 0xad, 0x52, 0xfe, 0xb8,
-	0x8f, 0xcf, 0xaa, 0xde, 0x97, 0x98, 0xf5, 0xf7, 0x69, 0x39, 0xb4, 0x82, 0x4c, 0xd7, 0xac, 0xd8,
-	0xfb, 0x92, 0x56, 0x69, 0x8a, 0x40, 0x9b, 0x62, 0xca, 0x60, 0x39, 0xd1, 0x11, 0x56, 0x8f, 0x98,
-	0x8c, 0x34, 0x6e, 0x33, 0x32, 0x86, 0x4f, 0x61, 0x3a, 0x1a, 0xc1, 0x85, 0x2f, 0xc0, 0x95, 0x81,
-	0xb5, 0xd3, 0x6c, 0x7a, 0x5d, 0xe4, 0x04, 0x47, 0x58, 0x6d, 0x31, 0x4d, 0xbd, 0xdf, 0xd3, 0xd6,
-	0x87, 0x35, 0x19, 0xce, 0x88, 0x28, 0x50, 0x47, 0x23, 0xf9, 0xf0, 0xd7, 0x60, 0x6d, 0x94, 0xdd,
-	0xee, 0x06, 0xaa, 0xc7, 0xa4, 0xa5, 0xf5, 0x7b, 0x8c, 0xb4, 0x41, 0xba, 0x81, 0x8e, 0xc6, 0xc9,
-	0xd0, 0x61, 0x75, 0xee, 0xb2, 0xbb, 0x41, 0xb9, 0x1d, 0xab, 0xbf, 0x61, 0xca, 0x52, 0x4a, 0x25,
-	0x65, 0xd2, 0x0d, 0x8c, 0xb0, 0x1d, 0xeb, 0x28, 0xcb, 0x1a, 0xa4, 0x85, 0xcf, 0x8b, 0x98, 0x0f,
-	0xce, 0xe9, 0xd4, 0x0e, 0xc6, 0x75, 0xf8, 0x98, 0x89, 0xcf, 0xd3, 0x22, 0x08, 0xf0, 0x53, 0x30,
-	0xc7, 0x0d, 0xcf, 0x2b, 0x55, 0x3e, 0x31, 0xa7, 0xe5, 0x4d, 0x43, 0xb0, 0x5f, 0xd3, 0xb7, 0x0f,
-	0x80, 0xfa, 0x57, 0x0a, 0xf8, 0x00, 0xe1, 0xd7, 0x1d, 0x1c, 0x13, 0xb8, 0x0d, 0xe6, 0xca, 0x6d,
-	0x1c, 0x39, 0xf4, 0xf7, 0x2e, 0x9b, 0x2c, 0x4b, 0xf7, 0x72, 0x62, 0x3e, 0x9d, 0xdb, 0xd1, 0x00,
-	0x02, 0x6f, 0x27, 0x3b, 0x92, 0xca, 0x87, 0xd9, 0xa2, 0x00, 0x73, 0x23, 0x4a, 0x16, 0xa8, 0xdb,
-	0xc9, 0xf8, 0x62, 0x3f, 0xfc, 0x07, 0x30, 0x6e, 0x44, 0xc2, 0xa9, 0x3f, 0x02, 0xb3, 0x08, 0xc7,
-	0xed, 0x30, 0x88, 0x31, 0x54, 0xc1, 0x07, 0xd5, 0x8e, 0xeb, 0xe2, 0x38, 0x66, 0xe7, 0x98, 0x45,
-	0xc9, 0x23, 0xbc, 0x0a, 0x66, 0xe8, 0x1e, 0xdc, 0x89, 0xf9, 0xf0, 0x42, 0xe2, 0x69, 0xeb, 0x1f,
-	0x8a, 0x74, 0x78, 0xb8, 0x04, 0x40, 0x29, 0x24, 0x55, 0xe2, 0x44, 0x04, 0x37, 0x72, 0x13, 0xf0,
-	0x0a, 0xc8, 0x89, 0x2d, 0x8f, 0xd9, 0xe8, 0x58, 0xcd, 0x29, 0x70, 0x19, 0xcc, 0x23, 0x1c, 0x9f,
-	0x1b, 0x26, 0xe1, 0x02, 0x98, 0xdd, 0xf7, 0x7c, 0x9f, 0x3d, 0x4d, 0x51, 0x37, 0xed, 0x04, 0xf9,
-	0xc8, 0x6d, 0x79, 0xa7, 0x38, 0x77, 0x89, 0xaa, 0xec, 0xe2, 0x98, 0x44, 0xe1, 0x19, 0x45, 0xb0,
-	0x6d, 0x2d, 0x37, 0x0d, 0xaf, 0x81, 0xd5, 0x1d, 0xdf, 0x71, 0x8f, 0x5b, 0xa1, 0xcf, 0x7e, 0x95,
-	0x55, 0xc2, 0x88, 0xd8, 0x5d, 0xd4, 0xcd, 0x35, 0xe0, 0x0d, 0xb0, 0x76, 0x18, 0xd4, 0x47, 0x3a,
-	0x31, 0x5c, 0x05, 0x97, 0x59, 0xbf, 0x4b, 0x99, 0x9b, 0x70, 0x0d, 0xac, 0x1c, 0x06, 0x8d, 0x21,
-	0xc7, 0xd1, 0xd6, 0x7f, 0x66, 0xf9, 0x79, 0x44, 0xab, 0xa5, 0xfc, 0xfd, 0xa2, 0x65, 0xd5, 0xca,
-	0x25, 0xb3, 0xf6, 0xb4, 0x6c, 0x59, 0xe5, 0x97, 0x26, 0xca, 0x4d, 0xc0, 0x1f, 0x81, 0xcd, 0x21,
-	0x73, 0xed, 0xb0, 0x64, 0x17, 0xad, 0x9a, 0x8d, 0x8a, 0xcf, 0x9e, 0x99, 0xa8, 0x56, 0x2d, 0xe5,
-	0x2b, 0xd5, 0xbd, 0xb2, 0xcd, 0x43, 0xc0, 0xd0, 0x96, 0x99, 0xdf, 0x35, 0x51, 0x6e, 0x12, 0xde,
-	0x01, 0xba, 0x64, 0x18, 0x47, 0x9c, 0x3a, 0x27, 0x3e, 0x3f, 0x2c, 0xa3, 0xc3, 0x83, 0xdc, 0x25,
-	0x16, 0x3b, 0x6a, 0xc8, 0x5b, 0x56, 0x6e, 0x1a, 0x6e, 0x81, 0x3b, 0x3b, 0x56, 0xbe, 0xb0, 0xbf,
-	0x57, 0xb6, 0xcc, 0x5a, 0xc5, 0x34, 0x51, 0xad, 0x52, 0x46, 0x76, 0xcd, 0x7e, 0x55, 0x43, 0xaf,
-	0xd2, 0x27, 0x6e, 0xc0, 0x3c, 0xf8, 0xec, 0xfd, 0xb0, 0xe3, 0x4e, 0x83, 0xe1, 0xc7, 0x60, 0x63,
-	0xbc, 0x84, 0xb8, 0x5b, 0x13, 0xfe, 0x02, 0xfc, 0xec, 0x5d, 0xa8, 0x71, 0xaf, 0x38, 0xba, 0xf8,
-	0x15, 0x22, 0x0a, 0x2d, 0x78, 0x13, 0x7c, 0x34, 0x1e, 0x45, 0x43, 0xe3, 0xc1, 0xff, 0x03, 0xfa,
-	0xae, 0x69, 0xe5, 0x3f, 0xbf, 0x38, 0x2c, 0x6f, 0x14, 0xb8, 0x0d, 0x3e, 0x41, 0xf9, 0xd2, 0x6e,
-	0xf9, 0xa0, 0xf6, 0x1e, 0xf8, 0x6f, 0x14, 0xf8, 0x4b, 0xf0, 0xe0, 0xdd, 0xc0, 0x71, 0x17, 0xfc,
-	0x56, 0x81, 0x26, 0x78, 0xf2, 0xde, 0xef, 0x1b, 0x27, 0xf3, 0x9d, 0x02, 0x6f, 0x82, 0x0f, 0x47,
-	0xf3, 0x45, 0x1e, 0xbe, 0x57, 0xe0, 0x26, 0xb8, 0x75, 0xe1, 0x9b, 0x04, 0xf2, 0x8f, 0x0a, 0xfc,
-	0x39, 0xb8, 0x7f, 0x11, 0x64, 0xdc, 0x31, 0xfe, 0xa4, 0xc0, 0xc7, 0xe0, 0xe1, 0x7b, 0xbc, 0x63,
-	0x9c, 0xc0, 0x9f, 0x2f, 0xb8, 0x87, 0x48, 0xf6, 0x0f, 0xef, 0xbe, 0x87, 0x40, 0xfe, 0x45, 0x81,
-	0xeb, 0xe0, 0xda, 0x68, 0x08, 0xad, 0x89, 0xbf, 0x2a, 0xf0, 0x36, 0xd8, 0xb8, 0x50, 0x89, 0xc2,
-	0xfe, 0xa6, 0x40, 0x15, 0xac, 0x94, 0xca, 0xb5, 0xa7, 0xf9, 0xa2, 0x55, 0x7b, 0x59, 0xb4, 0xf7,
-	0x6a, 0x55, 0x1b, 0x99, 0xd5, 0x6a, 0xee, 0x0f, 0x93, 0xf4, 0x28, 0x29, 0x4f, 0xa9, 0x2c, 0x9c,
-	0xb5, 0xa7, 0x65, 0x54, 0xb3, 0x8a, 0x2f, 0xcc, 0x12, 0x45, 0x7e, 0x3d, 0x09, 0x97, 0x01, 0xa0,
-	0xb0, 0x4a, 0xb9, 0x58, 0xb2, 0xab, 0xb9, 0xdf, 0x4d, 0xc1, 0x45, 0x30, 0x6b, 0xbe, 0xb2, 0x4d,
-	0x54, 0xca, 0x5b, 0xb9, 0xff, 0x4e, 0x6d, 0x85, 0x00, 0x0c, 0xf6, 0x05, 0x38, 0x03, 0x26, 0xf7,
-	0x5f, 0xe4, 0x26, 0xe0, 0x1c, 0x98, 0xb6, 0xcc, 0x7c, 0xd5, 0xcc, 0x29, 0x70, 0x05, 0x2c, 0x9b,
-	0x96, 0x59, 0xb0, 0x8b, 0xe5, 0x52, 0x0d, 0x1d, 0x96, 0x4a, 0xac, 0x6f, 0xe4, 0xc0, 0xc2, 0xcb,
-	0xbc, 0x5d, 0xd8, 0x4b, 0x2c, 0x53, 0xb4, 0x3f, 0x59, 0xe5, 0xc2, 0x7e, 0x0d, 0xe5, 0x0b, 0x26,
-	0x4a, 0xcc, 0x97, 0x28, 0x90, 0x09, 0x25, 0x96, 0xe9, 0x7b, 0x8f, 0xc1, 0x9c, 0x1d, 0x39, 0x41,
-	0xdc, 0x0e, 0x23, 0x02, 0xef, 0xc9, 0x0f, 0x4b, 0x62, 0x52, 0x88, 0x01, 0x75, 0x7d, 0xf9, 0xfc,
-	0x99, 0xcf, 0x09, 0x7d, 0x62, 0x53, 0xf9, 0xb1, 0xb2, 0x73, 0xe5, 0xcd, 0xbf, 0xd6, 0x27, 0xde,
-	0xbc, 0x5d, 0x57, 0x7e, 0x78, 0xbb, 0xae, 0xfc, 0xf3, 0xed, 0xba, 0xf2, 0xfb, 0x7f, 0xaf, 0x4f,
-	0xd4, 0x67, 0xd8, 0xff, 0xb4, 0xef, 0xff, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x02, 0xb3, 0xfd, 0x10,
-	0x1c, 0x17, 0x00, 0x00,
+	// 2291 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x58, 0x5d, 0x5b, 0xdb, 0xc8,
+	0xf5, 0x47, 0x10, 0x08, 0x0c, 0x6f, 0x66, 0x08, 0x41, 0x79, 0x59, 0x44, 0x94, 0x4d, 0xfe, 0x2c,
+	0xff, 0x8a, 0xb4, 0xc9, 0x3e, 0x6d, 0x93, 0x66, 0x9b, 0x18, 0xa3, 0x04, 0x17, 0x61, 0x3b, 0x63,
+	0x91, 0x64, 0xaf, 0x5c, 0x21, 0x8f, 0xb1, 0x8a, 0x90, 0x1c, 0x69, 0xcc, 0x9a, 0xfd, 0x02, 0x7d,
+	0x7a, 0xd7, 0xcb, 0x7e, 0x88, 0xee, 0xf7, 0xc8, 0xbe, 0xb4, 0xdd, 0xb6, 0x77, 0xbd, 0x70, 0xdb,
+	0xf4, 0xe9, 0x17, 0xf0, 0xd3, 0x9b, 0xde, 0xf5, 0x99, 0x17, 0xe1, 0x91, 0x6c, 0x93, 0xdc, 0x31,
+	0xe7, 0xfc, 0x7e, 0x3f, 0xcd, 0x9c, 0x33, 0x73, 0xce, 0x31, 0x60, 0x31, 0x6a, 0xb9, 0xad, 0xc3,
+	0x7b, 0x51, 0xcb, 0xdd, 0x6a, 0x45, 0x21, 0x09, 0xe1, 0x24, 0x33, 0x5c, 0x37, 0x8e, 0x3c, 0xd2,
+	0x6c, 0x1f, 0x6e, 0xb9, 0xe1, 0xc9, 0xbd, 0xa3, 0xf0, 0x28, 0xbc, 0xc7, 0xbc, 0x87, 0xed, 0x06,
+	0x5b, 0xb1, 0x05, 0xfb, 0x8b, 0xb3, 0xf4, 0xff, 0xce, 0x83, 0x4b, 0x26, 0x71, 0xeb, 0xf0, 0x36,
+	0xb8, 0x54, 0x72, 0x4e, 0xb0, 0xaa, 0xac, 0x2b, 0x1b, 0x33, 0xdb, 0x8b, 0xbd, 0xae, 0x36, 0x7b,
+	0xe6, 0x9c, 0xf8, 0x8f, 0xf4, 0xc0, 0x39, 0xc1, 0x3a, 0x62, 0x4e, 0x68, 0x80, 0xcb, 0x3b, 0x0e,
+	0x71, 0x76, 0xbc, 0x48, 0x1d, 0x67, 0xb8, 0xe5, 0x5e, 0x57, 0x5b, 0xe4, 0xb8, 0xba, 0x43, 0x1c,
+	0xa3, 0xee, 0x45, 0x3a, 0x4a, 0x30, 0x70, 0x13, 0x4c, 0xbd, 0xca, 0x5b, 0x14, 0x3d, 0xc1, 0xd0,
+	0xb0, 0xd7, 0xd5, 0x16, 0x38, 0xfa, 0x0b, 0xc7, 0xe7, 0x60, 0x81, 0x80, 0x65, 0xb0, 0xbc, 0x8b,
+	0x9d, 0x88, 0x1c, 0x62, 0x87, 0x14, 0x03, 0x82, 0xa3, 0x53, 0xc7, 0xdf, 0x8f, 0xd5, 0xd9, 0x75,
+	0x65, 0x63, 0x62, 0xfb, 0xa3, 0x5e, 0x57, 0xbb, 0xc6, 0x89, 0xcd, 0x04, 0x64, 0x78, 0x02, 0xa5,
+	0xa3, 0x61, 0x4c, 0x58, 0x04, 0x4b, 0xa6, 0x8f, 0x5d, 0xe2, 0x85, 0x81, 0xed, 0x9d, 0xe0, 0xb0,
+	0x4d, 0xf6, 0x63, 0x75, 0x8e, 0xc9, 0xdd, 0xe8, 0x75, 0xb5, 0x55, 0x2e, 0x87, 0x05, 0xc4, 0x20,
+	0x1c, 0xa3, 0xa3, 0x41, 0x16, 0x2c, 0x82, 0x9c, 0xe5, 0xc5, 0x04, 0x07, 0x05, 0xdf, 0xc3, 0x01,
+	0x39, 0x40, 0x56, 0xac, 0xae, 0xac, 0x4f, 0x6c, 0xcc, 0xc8, 0x1b, 0xf3, 0x19, 0xc2, 0x70, 0x19,
+	0xc4, 0x68, 0x47, 0x7e, 0xac, 0xa3, 0x01, 0x1a, 0x44, 0x60, 0x39, 0x5f, 0x3f, 0xc5, 0x11, 0xf1,
+	0x62, 0x2c, 0xa9, 0x5d, 0x65, 0x6a, 0xeb, 0xbd, 0xae, 0x76, 0x93, 0xab, 0x39, 0x09, 0x28, 0x2d,
+	0x38, 0x8c, 0x0c, 0x1f, 0x82, 0x79, 0xbe, 0xca, 0xb7, 0x49, 0x68, 0x5b, 0x55, 0x75, 0x75, 0x5d,
+	0xd9, 0x98, 0x96, 0x73, 0xe3, 0xb4, 0x49, 0x68, 0x10, 0x2a, 0x90, 0x46, 0xc2, 0x02, 0x58, 0xe0,
+	0x86, 0x02, 0x8e, 0xa8, 0xb1, 0xa9, 0xaa, 0x8c, 0x2b, 0x45, 0x48, 0x7c, 0xdf, 0xc5, 0x11, 0x31,
+	0x9c, 0x36, 0x69, 0xea, 0x28, 0x43, 0x81, 0x8f, 0x65, 0x91, 0x67, 0x9e, 0x8f, 0xd5, 0x6b, 0x2c,
+	0xdd, 0x57, 0x7a, 0x5d, 0x2d, 0x27, 0x44, 0x28, 0xbb, 0xe1, 0xf9, 0x38, 0xc5, 0xa6, 0xd8, 0xfe,
+	0xee, 0xf7, 0xf0, 0x19, 0x23, 0x5f, 0xcf, 0xde, 0xac, 0x63, 0x7c, 0x26, 0xb8, 0x69, 0x24, 0xb4,
+	0xc0, 0x32, 0x37, 0xd8, 0x51, 0x3b, 0x26, 0xb8, 0x5e, 0xc8, 0x33, 0x81, 0x1b, 0x4c, 0xe0, 0x7a,
+	0xaf, 0xab, 0x5d, 0xe5, 0x02, 0x84, 0xbb, 0x0d, 0xd7, 0x11, 0x3a, 0xc3, 0x68, 0x34, 0x16, 0x3c,
+	0x5d, 0x15, 0x8c, 0x23, 0x96, 0x15, 0x8d, 0x65, 0x45, 0x8a, 0x85, 0xc8, 0x71, 0x0b, 0xe3, 0x48,
+	0x24, 0x24, 0x43, 0x81, 0x36, 0x58, 0x3a, 0x4f, 0xd1, 0xb9, 0xce, 0x3a, 0xd3, 0xb9, 0xdb, 0xeb,
+	0x6a, 0x3a, 0xd7, 0xf1, 0x02, 0x8f, 0x78, 0x8e, 0x6f, 0xf4, 0xb3, 0x2c, 0x49, 0x0e, 0x0a, 0xc0,
+	0x47, 0x60, 0x96, 0xfe, 0x9d, 0xe4, 0xf7, 0x16, 0xcb, 0x91, 0xda, 0xeb, 0x6a, 0x57, 0xb8, 0x1e,
+	0x63, 0xf7, 0x93, 0x2c, 0x83, 0x61, 0x05, 0x40, 0xba, 0xcc, 0xa4, 0x59, 0x67, 0x12, 0xd2, 0x85,
+	0x63, 0x12, 0x83, 0xb9, 0x1e, 0xc2, 0x85, 0x9f, 0x81, 0x39, 0x66, 0x4d, 0xb2, 0x7d, 0x9b, 0xc5,
+	0xfb, 0x5a, 0xaf, 0xab, 0xad, 0xc8, 0x5a, 0xfd, 0x94, 0xa7, 0xe0, 0xc9, 0x61, 0x92, 0x74, 0x7f,
+	0xcc, 0xd8, 0xd9, 0xc3, 0xf4, 0x73, 0x2e, 0x83, 0xe1, 0x3e, 0x58, 0xa2, 0xcb, 0x74, 0xbe, 0xef,
+	0x30, 0x05, 0xad, 0xd7, 0xd5, 0x6e, 0x48, 0x0a, 0x03, 0x49, 0x1f, 0x64, 0xc2, 0x6d, 0xb0, 0x50,
+	0xe4, 0xa9, 0x28, 0xf8, 0xd4, 0x1e, 0xa9, 0x9f, 0x64, 0xef, 0x4e, 0x92, 0x2a, 0x97, 0x03, 0x74,
+	0x94, 0x61, 0xd0, 0x17, 0x9d, 0xb6, 0x54, 0x89, 0x43, 0xb0, 0xba, 0xc9, 0x84, 0xa4, 0x00, 0x67,
+	0x84, 0x8c, 0x98, 0xc2, 0x74, 0x34, 0x8c, 0x3c, 0xa8, 0x69, 0x87, 0xc7, 0x38, 0x50, 0xff, 0xff,
+	0x7d, 0x9a, 0x84, 0xc2, 0x06, 0x34, 0x19, 0x19, 0x3e, 0x01, 0xf3, 0xd5, 0xc0, 0x69, 0xc5, 0xcd,
+	0x90, 0x14, 0xc2, 0x76, 0x40, 0xd4, 0x07, 0xac, 0x16, 0x4a, 0x69, 0x8b, 0x85, 0xdb, 0x70, 0xa9,
+	0x5f, 0x47, 0x69, 0x3c, 0xb4, 0xc0, 0xd2, 0x8b, 0x76, 0x48, 0x9c, 0x6d, 0xc7, 0x3d, 0xc6, 0x41,
+	0x7d, 0xfb, 0x8c, 0xe0, 0x58, 0xfd, 0x94, 0x89, 0xac, 0xf5, 0xba, 0xda, 0x75, 0x2e, 0xf2, 0x86,
+	0x42, 0x8c, 0x43, 0x8e, 0x31, 0x0e, 0x29, 0x48, 0x47, 0x83, 0x44, 0xda, 0x4a, 0x2a, 0x11, 0x7e,
+	0x19, 0x12, 0xac, 0x3e, 0xc9, 0x96, 0xab, 0x56, 0x84, 0x8d, 0xd3, 0x90, 0x46, 0x27, 0xc1, 0xc8,
+	0x11, 0x09, 0xa3, 0xa8, 0xdd, 0x22, 0x85, 0x26, 0x76, 0x8f, 0xd5, 0xa7, 0xd9, 0x6b, 0x7c, 0x1e,
+	0x11, 0x8e, 0x32, 0x5c, 0x0a, 0x93, 0x22, 0x22, 0x91, 0xf5, 0xdf, 0x4c, 0x82, 0xa9, 0x7d, 0x7c,
+	0x72, 0x88, 0x23, 0x7a, 0xa5, 0x69, 0x17, 0x34, 0x3b, 0xd8, 0xad, 0x38, 0xa4, 0x29, 0xba, 0xa0,
+	0x14, 0x1b, 0x4c, 0xdc, 0xba, 0x81, 0x3b, 0xd8, 0x35, 0x5a, 0x0e, 0x7d, 0x17, 0x29, 0x38, 0x7c,
+	0x00, 0x66, 0xf2, 0x47, 0xb4, 0xac, 0xd6, 0xeb, 0x11, 0x6b, 0x59, 0x33, 0xdb, 0x2b, 0xbd, 0xae,
+	0xb6, 0x24, 0xaa, 0x2f, 0x75, 0x19, 0x4e, 0xbd, 0x1e, 0xe9, 0xa8, 0x8f, 0xa3, 0xf1, 0x7c, 0xe6,
+	0x78, 0x7e, 0x2b, 0xf4, 0x02, 0xb2, 0x6b, 0xdb, 0x15, 0x46, 0x9e, 0x63, 0x64, 0x29, 0x9e, 0x8d,
+	0x04, 0x62, 0x34, 0x09, 0x69, 0x09, 0x95, 0x41, 0x22, 0x8d, 0xe7, 0xb6, 0x13, 0x63, 0xda, 0x6c,
+	0x71, 0xb6, 0x80, 0x1e, 0x3a, 0x31, 0x16, 0xad, 0x59, 0x60, 0xe8, 0x23, 0xa4, 0x27, 0xb0, 0xc2,
+	0x23, 0x76, 0xde, 0x46, 0xf6, 0x11, 0xb2, 0xf3, 0xfa, 0xe1, 0x91, 0x38, 0xae, 0x0c, 0x86, 0x79,
+	0x30, 0x4f, 0x97, 0xa2, 0x86, 0x5a, 0x55, 0xf5, 0x6b, 0x85, 0xa5, 0x41, 0x7a, 0x35, 0x8c, 0x2e,
+	0xaa, 0x09, 0xef, 0x3b, 0x29, 0x06, 0x7c, 0x0e, 0x16, 0xfb, 0x86, 0x4a, 0x14, 0x76, 0xce, 0xd4,
+	0x6f, 0xb8, 0xc8, 0xcd, 0x5e, 0x57, 0x53, 0x07, 0x45, 0x5a, 0x14, 0xa3, 0xa3, 0x2c, 0x2b, 0xd9,
+	0x0b, 0x7d, 0xda, 0x5c, 0xe6, 0xdb, 0xe1, 0x7b, 0x61, 0x25, 0x41, 0x88, 0xa4, 0x19, 0xb4, 0x40,
+	0xf6, 0x55, 0xcd, 0xa0, 0xce, 0xe2, 0xaa, 0x7e, 0xa7, 0x64, 0xab, 0x8a, 0xbc, 0x1d, 0x2c, 0x60,
+	0x3a, 0x1a, 0xc2, 0x85, 0x3f, 0xe2, 0x33, 0x95, 0xfa, 0x15, 0x1d, 0x92, 0x66, 0xef, 0xcf, 0x6e,
+	0xb1, 0xd1, 0x6c, 0x8b, 0xda, 0xe4, 0xc9, 0x8a, 0x0a, 0xea, 0x88, 0x41, 0xf5, 0xbf, 0xcd, 0x81,
+	0x29, 0x1b, 0xb3, 0x82, 0xf2, 0x04, 0xcc, 0xf3, 0xbf, 0x4a, 0x98, 0x7c, 0x11, 0x46, 0xc7, 0x83,
+	0x97, 0x91, 0x30, 0xb7, 0x11, 0x70, 0xbf, 0x8e, 0xd2, 0x78, 0xf8, 0x63, 0x00, 0xb8, 0x81, 0xdd,
+	0x28, 0x3e, 0xa8, 0x5d, 0xed, 0x75, 0x35, 0x98, 0x62, 0xf3, 0x9b, 0x24, 0x21, 0x69, 0x03, 0xdc,
+	0xc1, 0xbe, 0x73, 0x66, 0x39, 0x04, 0x07, 0xee, 0x99, 0x98, 0xbe, 0xe6, 0xe5, 0x06, 0x58, 0xa7,
+	0x7e, 0xc3, 0xe7, 0x00, 0xe3, 0x84, 0x36, 0xc0, 0x34, 0x05, 0xfe, 0x02, 0xe4, 0xd2, 0x16, 0x74,
+	0xca, 0x2e, 0xf5, 0xbc, 0x7c, 0xa9, 0xb3, 0x32, 0x46, 0x74, 0xaa, 0xa3, 0x01, 0x1e, 0xfc, 0x1c,
+	0xac, 0x1c, 0xb4, 0xea, 0x0e, 0xc1, 0xf5, 0xcc, 0xbe, 0xe6, 0x99, 0xe0, 0xed, 0x5e, 0x57, 0xd3,
+	0xb8, 0x60, 0x9b, 0xc3, 0x8c, 0xc1, 0xfd, 0x0d, 0x57, 0xa0, 0x31, 0x42, 0x61, 0x3b, 0xa8, 0x5b,
+	0xde, 0x89, 0x47, 0xd4, 0x95, 0x75, 0x65, 0x63, 0x52, 0x8e, 0x51, 0x44, 0x7d, 0x86, 0x4f, 0x9d,
+	0x3a, 0x92, 0x90, 0xf0, 0x29, 0x98, 0x37, 0x3b, 0x1e, 0x29, 0x07, 0xf4, 0x05, 0xb6, 0x23, 0xac,
+	0x5e, 0x1d, 0xb8, 0x6e, 0x1d, 0x8f, 0x18, 0x61, 0x60, 0x34, 0x38, 0x80, 0x5e, 0x37, 0x99, 0x00,
+	0x77, 0x41, 0xae, 0x10, 0x06, 0x31, 0x1b, 0x1b, 0xdc, 0x33, 0x5e, 0xc6, 0x56, 0xb3, 0x57, 0xdf,
+	0xed, 0x23, 0x92, 0x12, 0x36, 0xc0, 0x82, 0x0f, 0xc1, 0xac, 0x19, 0x38, 0x87, 0x3e, 0xae, 0xb4,
+	0xa2, 0xb0, 0x21, 0x26, 0xb7, 0xd5, 0x5e, 0x57, 0x5b, 0x16, 0x3b, 0x61, 0x4e, 0xa3, 0x45, 0xbd,
+	0xf4, 0x09, 0xf7, 0xb1, 0xf0, 0x31, 0x98, 0x13, 0xfb, 0x29, 0x38, 0x31, 0x4e, 0x26, 0x1d, 0xe9,
+	0xfd, 0x8b, 0xdd, 0x1b, 0x2e, 0x75, 0xeb, 0x28, 0x85, 0xa6, 0x17, 0x45, 0xac, 0x59, 0x54, 0xf7,
+	0xe9, 0x84, 0x93, 0xb9, 0x28, 0x09, 0x9f, 0x27, 0x84, 0x5d, 0x94, 0x34, 0x85, 0xf6, 0x5e, 0x61,
+	0xa9, 0x36, 0xdb, 0x8d, 0x86, 0x8f, 0xc5, 0x58, 0x23, 0x85, 0x32, 0x11, 0x89, 0x39, 0xa0, 0xaf,
+	0x21, 0x18, 0x70, 0x4f, 0x2a, 0xa1, 0x85, 0xf0, 0xe4, 0xc4, 0x09, 0xea, 0xb1, 0xaa, 0x67, 0x27,
+	0xf3, 0x7e, 0x09, 0x75, 0x05, 0x46, 0xae, 0xa0, 0x09, 0x8f, 0x9e, 0x0a, 0xb5, 0x83, 0x00, 0x47,
+	0xe7, 0x5d, 0x80, 0x0f, 0x03, 0xd2, 0xa9, 0x22, 0xe6, 0x97, 0xfb, 0x40, 0x86, 0x42, 0x7f, 0x2a,
+	0x98, 0x1d, 0x82, 0xa3, 0xc0, 0xf1, 0xcf, 0x65, 0xf8, 0x28, 0x20, 0x6d, 0x08, 0x0b, 0x84, 0x2c,
+	0x34, 0x40, 0xa3, 0xe9, 0xad, 0x92, 0x08, 0xc7, 0xb1, 0x7d, 0xd6, 0xc2, 0xb1, 0x8a, 0xd9, 0xb1,
+	0xa4, 0xf4, 0xc6, 0xcc, 0x69, 0x10, 0xea, 0xd5, 0x91, 0x8c, 0xa5, 0xb7, 0x94, 0x2f, 0xf7, 0xf0,
+	0x59, 0xd5, 0xfb, 0x12, 0xb3, 0xfa, 0x3e, 0x29, 0x87, 0x56, 0x90, 0xe9, 0x98, 0x15, 0x7b, 0x5f,
+	0xd2, 0x5b, 0x9a, 0x22, 0xd0, 0xa2, 0x98, 0x32, 0x58, 0x4e, 0x74, 0x84, 0xd5, 0x23, 0x26, 0x23,
+	0xb5, 0xdb, 0x8c, 0x8c, 0xe1, 0x53, 0x98, 0x8e, 0x86, 0x70, 0xe1, 0x4b, 0x70, 0xa5, 0x6f, 0x6d,
+	0x37, 0x1a, 0x5e, 0x07, 0x39, 0xc1, 0x11, 0x56, 0x9b, 0x4c, 0x53, 0xef, 0x75, 0xb5, 0xb5, 0x41,
+	0x4d, 0x86, 0x33, 0x22, 0x0a, 0xd4, 0xd1, 0x50, 0x3e, 0xfc, 0x25, 0x58, 0x1d, 0x66, 0xb7, 0x3b,
+	0x81, 0xea, 0x31, 0x69, 0x69, 0xee, 0x1e, 0x21, 0x6d, 0x90, 0x4e, 0xa0, 0xa3, 0x51, 0x32, 0xb4,
+	0x59, 0x9d, 0xbb, 0xec, 0x4e, 0x50, 0x6e, 0xc5, 0xea, 0xaf, 0x98, 0xb2, 0x94, 0x52, 0x49, 0x99,
+	0x74, 0x02, 0x23, 0x6c, 0xc5, 0x3a, 0xca, 0xb2, 0xfa, 0x69, 0xe1, 0xfd, 0x22, 0xe6, 0x8d, 0x73,
+	0x32, 0x35, 0x83, 0x71, 0x1d, 0xde, 0x66, 0xe2, 0xf3, 0xb4, 0x08, 0x02, 0xfc, 0x14, 0xcc, 0x70,
+	0xc3, 0x8b, 0x4a, 0x95, 0x77, 0xcc, 0x49, 0x79, 0xd2, 0x10, 0xec, 0x37, 0xf4, 0xeb, 0x7d, 0xa0,
+	0xfe, 0x6b, 0x05, 0x5c, 0x46, 0xf8, 0x4d, 0x1b, 0xc7, 0x04, 0x6e, 0x81, 0x99, 0x72, 0x0b, 0x47,
+	0x0e, 0xfd, 0x85, 0xcb, 0x3a, 0xcb, 0xc2, 0xfd, 0x9c, 0xe8, 0x4f, 0xe7, 0x76, 0xd4, 0x87, 0xc0,
+	0x3b, 0xc9, 0x8c, 0xa4, 0xf2, 0x66, 0x36, 0x2f, 0xc0, 0xdc, 0x88, 0x92, 0x01, 0xea, 0x4e, 0xd2,
+	0xbe, 0xd8, 0x4f, 0xfd, 0x3e, 0x8c, 0x1b, 0x91, 0x70, 0xea, 0x8f, 0xc1, 0x34, 0xc2, 0x71, 0x2b,
+	0x0c, 0x62, 0x0c, 0x55, 0x70, 0xb9, 0xda, 0x76, 0x5d, 0x1c, 0xc7, 0x6c, 0x1f, 0xd3, 0x28, 0x59,
+	0xc2, 0xab, 0x60, 0x8a, 0xce, 0xc1, 0xed, 0x98, 0x37, 0x2f, 0x24, 0x56, 0x9b, 0x7f, 0x57, 0xa4,
+	0xcd, 0xc3, 0x05, 0x00, 0x4a, 0x21, 0xa9, 0x12, 0x27, 0x22, 0xb8, 0x9e, 0x1b, 0x83, 0x57, 0x40,
+	0x4e, 0x4c, 0x79, 0xcc, 0x46, 0xdb, 0x6a, 0x4e, 0x81, 0x8b, 0x60, 0x16, 0xe1, 0xf8, 0xdc, 0x30,
+	0x0e, 0xe7, 0xc0, 0xf4, 0x9e, 0xe7, 0xfb, 0x6c, 0x35, 0x41, 0xdd, 0xb4, 0x12, 0xe4, 0x23, 0xb7,
+	0xe9, 0x9d, 0xe2, 0xdc, 0x25, 0xaa, 0xb2, 0x83, 0x63, 0x12, 0x85, 0x67, 0x14, 0xc1, 0xa6, 0xb5,
+	0xdc, 0x24, 0xbc, 0x06, 0x56, 0xb6, 0x7d, 0xc7, 0x3d, 0x6e, 0x86, 0x3e, 0xfb, 0x55, 0x56, 0x09,
+	0x23, 0x62, 0x77, 0x50, 0x27, 0x57, 0x87, 0x37, 0xc0, 0xea, 0x41, 0x70, 0x38, 0xd4, 0x89, 0xe1,
+	0x0a, 0x58, 0x62, 0xf5, 0x2e, 0x65, 0x6e, 0xc0, 0x55, 0xb0, 0x7c, 0x10, 0xd4, 0x07, 0x1c, 0x47,
+	0x9b, 0xff, 0x9e, 0xe6, 0xfb, 0x11, 0xa5, 0x96, 0xf2, 0xf7, 0x8a, 0x96, 0x55, 0x2b, 0x97, 0xcc,
+	0xda, 0xb3, 0xb2, 0x65, 0x95, 0x5f, 0x99, 0x28, 0x37, 0x06, 0x7f, 0x00, 0x36, 0x06, 0xcc, 0xb5,
+	0x83, 0x92, 0x5d, 0xb4, 0x6a, 0x36, 0x2a, 0x3e, 0x7f, 0x6e, 0xa2, 0x5a, 0xb5, 0x94, 0xaf, 0x54,
+	0x77, 0xcb, 0x36, 0x0f, 0x01, 0x43, 0x5b, 0x66, 0x7e, 0xc7, 0x44, 0xb9, 0x71, 0x78, 0x17, 0xe8,
+	0x92, 0x61, 0x14, 0x71, 0xe2, 0x9c, 0xf8, 0xe2, 0xa0, 0x8c, 0x0e, 0xf6, 0x73, 0x97, 0x58, 0xec,
+	0xa8, 0x21, 0x6f, 0x59, 0xb9, 0x49, 0xb8, 0x09, 0xee, 0x6e, 0x5b, 0xf9, 0xc2, 0xde, 0x6e, 0xd9,
+	0x32, 0x6b, 0x15, 0xd3, 0x44, 0xb5, 0x4a, 0x19, 0xd9, 0x35, 0xfb, 0x75, 0x0d, 0xbd, 0x4e, 0xef,
+	0xb8, 0x0e, 0xf3, 0xe0, 0xb3, 0x0f, 0xc3, 0x8e, 0xda, 0x0d, 0x86, 0x1f, 0x83, 0xf5, 0xd1, 0x12,
+	0xe2, 0x6c, 0x0d, 0xf8, 0x33, 0xf0, 0x93, 0xf7, 0xa1, 0x46, 0x7d, 0xe2, 0xe8, 0xe2, 0x4f, 0x88,
+	0x28, 0x34, 0xe1, 0x2d, 0xf0, 0xd1, 0x68, 0x14, 0x0d, 0x8d, 0x07, 0xff, 0x0f, 0xe8, 0x3b, 0xa6,
+	0x95, 0xff, 0xfc, 0xe2, 0xb0, 0xbc, 0x55, 0xe0, 0x16, 0xf8, 0x04, 0xe5, 0x4b, 0x3b, 0xe5, 0xfd,
+	0xda, 0x07, 0xe0, 0xbf, 0x56, 0xe0, 0xcf, 0xc1, 0xc3, 0xf7, 0x03, 0x47, 0x1d, 0xf0, 0x1b, 0x05,
+	0x9a, 0xe0, 0xe9, 0x07, 0x7f, 0x6f, 0x94, 0xcc, 0xb7, 0x0a, 0xbc, 0x05, 0x6e, 0x0e, 0xe7, 0x8b,
+	0x3c, 0x7c, 0xa7, 0xc0, 0x0d, 0x70, 0xfb, 0xc2, 0x2f, 0x09, 0xe4, 0x1f, 0x14, 0xf8, 0x53, 0xf0,
+	0xe0, 0x22, 0xc8, 0xa8, 0x6d, 0xfc, 0x51, 0x81, 0x4f, 0xc0, 0xa3, 0x0f, 0xf8, 0xc6, 0x28, 0x81,
+	0x3f, 0x5d, 0x70, 0x0e, 0x91, 0xec, 0xef, 0xdf, 0x7f, 0x0e, 0x81, 0xfc, 0xb3, 0x02, 0xd7, 0xc0,
+	0xb5, 0xe1, 0x10, 0x7a, 0x27, 0xfe, 0xa2, 0xc0, 0x3b, 0x60, 0xfd, 0x42, 0x25, 0x0a, 0xfb, 0xab,
+	0x02, 0x55, 0xb0, 0x5c, 0x2a, 0xd7, 0x9e, 0xe5, 0x8b, 0x56, 0xed, 0x55, 0xd1, 0xde, 0xad, 0x55,
+	0x6d, 0x64, 0x56, 0xab, 0xb9, 0xdf, 0x8f, 0xd3, 0xad, 0xa4, 0x3c, 0xa5, 0xb2, 0x70, 0xd6, 0x9e,
+	0x95, 0x51, 0xcd, 0x2a, 0xbe, 0x34, 0x4b, 0x14, 0xf9, 0xd5, 0x38, 0x5c, 0x04, 0x80, 0xc2, 0x2a,
+	0xe5, 0x62, 0xc9, 0xae, 0xe6, 0x7e, 0x3b, 0x01, 0xe7, 0xc1, 0xb4, 0xf9, 0xda, 0x36, 0x51, 0x29,
+	0x6f, 0xe5, 0xfe, 0x33, 0xb1, 0x19, 0x02, 0xd0, 0x9f, 0x17, 0xe0, 0x14, 0x18, 0xdf, 0x7b, 0x99,
+	0x1b, 0x83, 0x33, 0x60, 0xd2, 0x32, 0xf3, 0x55, 0x33, 0xa7, 0xc0, 0x65, 0xb0, 0x68, 0x5a, 0x66,
+	0xc1, 0x2e, 0x96, 0x4b, 0x35, 0x74, 0x50, 0x2a, 0xb1, 0xba, 0x91, 0x03, 0x73, 0xaf, 0xf2, 0x76,
+	0x61, 0x37, 0xb1, 0x4c, 0xd0, 0xfa, 0x64, 0x95, 0x0b, 0x7b, 0x35, 0x94, 0x2f, 0x98, 0x28, 0x31,
+	0x5f, 0xa2, 0x40, 0x26, 0x94, 0x58, 0x26, 0xef, 0x3f, 0x01, 0x33, 0x76, 0xe4, 0x04, 0x71, 0x2b,
+	0x8c, 0x08, 0xbc, 0x2f, 0x2f, 0x16, 0x44, 0xa7, 0x10, 0x0d, 0xea, 0xfa, 0xe2, 0xf9, 0x9a, 0xf7,
+	0x09, 0x7d, 0x6c, 0x43, 0xf9, 0xa1, 0xb2, 0x7d, 0xe5, 0xed, 0x3f, 0xd7, 0xc6, 0xde, 0xbe, 0x5b,
+	0x53, 0xbe, 0x7f, 0xb7, 0xa6, 0xfc, 0xe3, 0xdd, 0x9a, 0xf2, 0xbb, 0x7f, 0xad, 0x8d, 0x1d, 0x4e,
+	0xb1, 0xff, 0x62, 0x3f, 0xf8, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x95, 0x9d, 0x8e, 0x65, 0x0e,
+	0x17, 0x00, 0x00,
 }

+ 1 - 1
tools/functional-tester/rpcpb/rpc.proto

@@ -55,7 +55,7 @@ message Etcd {
   string ClientTrustedCAFile = 27 [(gogoproto.moretags) = "yaml:\"trusted-ca-file\""];
 
   repeated string ListenPeerURLs = 31 [(gogoproto.moretags) = "yaml:\"listen-peer-urls\""];
-  repeated string InitialAdvertisePeerURLs = 32 [(gogoproto.moretags) = "yaml:\"initial-advertise-peer-urls\""];
+  repeated string AdvertisePeerURLs = 32 [(gogoproto.moretags) = "yaml:\"initial-advertise-peer-urls\""];
   bool PeerAutoTLS = 33 [(gogoproto.moretags) = "yaml:\"peer-auto-tls\""];
   bool PeerClientCertAuth = 34 [(gogoproto.moretags) = "yaml:\"peer-client-cert-auth\""];
   string PeerCertFile = 35 [(gogoproto.moretags) = "yaml:\"peer-cert-file\""];