From da6d284fbb35d1a44f75f9b9c331855414a0dc45 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Tue, 10 Apr 2018 10:26:27 -0500 Subject: [PATCH] vendor: update kata-containers agent This new version of kata-containers agent includes the fix for CPU hotplug race condition Shortlog: 131554d network: specify netlink protocol 49f01ed protocols/grpc: fix CPU hotplug race condition ee7850d mockreaper: implement mock reaper 9f60034 reaper: implement reaper interface Signed-off-by: Julio Montes --- Gopkg.lock | 4 +- Gopkg.toml | 2 +- .../agent/protocols/grpc/agent.pb.go | 234 ++++++++++++------ 3 files changed, 161 insertions(+), 79 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 5a85631d0b..96e175c52d 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -93,7 +93,7 @@ "protocols/client", "protocols/grpc" ] - revision = "c8199f60759a1d52932df37a1af710cdeada8c81" + revision = "a6166b794d3c5747cd8da1f943aec64c70f08afe" [[projects]] name = "github.com/kubernetes-incubator/cri-o" @@ -249,6 +249,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "2df221b473722077f7961415583a1e35c1e221f1ea2e2dbb8e98858cf42417b4" + inputs-digest = "cd6f57ab58ff674de73039bb4337cd1f2b24d069199704c510f8950e1121f395" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index eaf31783f0..ad57334a4b 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -60,7 +60,7 @@ [[constraint]] name = "github.com/kata-containers/agent" - revision = "c8199f60759a1d52932df37a1af710cdeada8c81" + revision = "a6166b794d3c5747cd8da1f943aec64c70f08afe" [[constraint]] name = "github.com/containerd/cri-containerd" diff --git a/vendor/github.com/kata-containers/agent/protocols/grpc/agent.pb.go b/vendor/github.com/kata-containers/agent/protocols/grpc/agent.pb.go index a109f6e521..7b5fc73b5f 100644 --- a/vendor/github.com/kata-containers/agent/protocols/grpc/agent.pb.go +++ b/vendor/github.com/kata-containers/agent/protocols/grpc/agent.pb.go @@ -749,6 +749,12 @@ func (m *UpdateRoutesRequest) GetRoutes() *Routes { } type OnlineCPUMemRequest struct { + // Wait specifies if the caller waits for the agent to online all resources. + // If true the agent returns once all resources have been connected, otherwise all + // resources are connected asynchronously and the agent returns immediately. + Wait bool `protobuf:"varint,1,opt,name=wait,proto3" json:"wait,omitempty"` + // NbCpus specifies the number of CPUs that were added and the agent has to online. + NbCpus uint32 `protobuf:"varint,2,opt,name=nb_cpus,json=nbCpus,proto3" json:"nb_cpus,omitempty"` } func (m *OnlineCPUMemRequest) Reset() { *m = OnlineCPUMemRequest{} } @@ -756,6 +762,20 @@ func (m *OnlineCPUMemRequest) String() string { return proto.CompactT func (*OnlineCPUMemRequest) ProtoMessage() {} func (*OnlineCPUMemRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{23} } +func (m *OnlineCPUMemRequest) GetWait() bool { + if m != nil { + return m.Wait + } + return false +} + +func (m *OnlineCPUMemRequest) GetNbCpus() uint32 { + if m != nil { + return m.NbCpus + } + return 0 +} + // Storage represents both the rootfs of the container, and any volume that // could have been defined through the Mount list of the OCI specification. type Storage struct { @@ -2449,6 +2469,21 @@ func (m *OnlineCPUMemRequest) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.Wait { + dAtA[i] = 0x8 + i++ + if m.Wait { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i++ + } + if m.NbCpus != 0 { + dAtA[i] = 0x10 + i++ + i = encodeVarintAgent(dAtA, i, uint64(m.NbCpus)) + } return i, nil } @@ -2997,6 +3032,12 @@ func (m *UpdateRoutesRequest) Size() (n int) { func (m *OnlineCPUMemRequest) Size() (n int) { var l int _ = l + if m.Wait { + n += 2 + } + if m.NbCpus != 0 { + n += 1 + sovAgent(uint64(m.NbCpus)) + } return n } @@ -5806,6 +5847,45 @@ func (m *OnlineCPUMemRequest) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: OnlineCPUMemRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Wait", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAgent + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + m.Wait = bool(v != 0) + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field NbCpus", wireType) + } + m.NbCpus = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAgent + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.NbCpus |= (uint32(b) & 0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipAgent(dAtA[iNdEx:]) @@ -6491,85 +6571,87 @@ var ( func init() { proto.RegisterFile("agent.proto", fileDescriptorAgent) } var fileDescriptorAgent = []byte{ - // 1271 bytes of a gzipped FileDescriptorProto + // 1297 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xdf, 0x6e, 0x1b, 0xc5, 0x17, 0xfe, 0x6d, 0x9c, 0x38, 0xf1, 0xb1, 0x9d, 0xa4, 0x93, 0x36, 0xd9, 0x9f, 0x5b, 0x95, 0xb0, - 0x40, 0x1b, 0x90, 0x9a, 0x8a, 0x80, 0x40, 0x2a, 0x42, 0x25, 0x4d, 0x4b, 0x94, 0x0b, 0x14, 0x6b, - 0x4c, 0x54, 0xee, 0xa2, 0xe9, 0xee, 0xc4, 0x59, 0xf0, 0xee, 0x2c, 0x33, 0xb3, 0x4e, 0x4d, 0xef, + 0x40, 0x1b, 0x90, 0x9a, 0x8a, 0x80, 0x40, 0x2a, 0x42, 0x25, 0x75, 0x4b, 0x94, 0x0b, 0x14, 0x6b, + 0x4c, 0x54, 0xee, 0xac, 0xc9, 0xee, 0xc4, 0x59, 0xf0, 0xee, 0x2c, 0x33, 0xb3, 0x49, 0x43, 0xef, 0x79, 0x02, 0x1e, 0x83, 0x3b, 0x5e, 0x80, 0x4b, 0x2e, 0x79, 0x04, 0xd4, 0xa7, 0xe0, 0x12, 0xcd, - 0xbf, 0xb5, 0xd7, 0x5e, 0x17, 0x29, 0xb5, 0xc4, 0x95, 0xe7, 0x9c, 0x33, 0xfe, 0xce, 0x77, 0xce, - 0xcc, 0x9c, 0xfd, 0xa0, 0x49, 0xfa, 0x34, 0x95, 0xfb, 0x19, 0x67, 0x92, 0xa1, 0xe5, 0x3e, 0xcf, - 0xc2, 0x4e, 0x83, 0x85, 0xb1, 0x71, 0x74, 0x6e, 0xf7, 0x19, 0xeb, 0x0f, 0xe8, 0x43, 0x6d, 0xbd, - 0xc8, 0x2f, 0x1e, 0xd2, 0x24, 0x93, 0x23, 0x13, 0x0c, 0xfe, 0xf6, 0x60, 0xfb, 0x88, 0x53, 0x22, - 0xe9, 0x11, 0x4b, 0x25, 0x89, 0x53, 0xca, 0x31, 0xfd, 0x31, 0xa7, 0x42, 0xa2, 0x77, 0xa1, 0x15, - 0x3a, 0xdf, 0x79, 0x1c, 0xf9, 0xde, 0xae, 0xb7, 0xd7, 0xc0, 0xcd, 0xc2, 0x77, 0x12, 0xa1, 0x1d, - 0x58, 0xa5, 0x2f, 0x69, 0xa8, 0xa2, 0x4b, 0x3a, 0x5a, 0x57, 0xe6, 0x49, 0x84, 0x3e, 0x86, 0xa6, - 0x90, 0x3c, 0x4e, 0xfb, 0xe7, 0xb9, 0xa0, 0xdc, 0xaf, 0xed, 0x7a, 0x7b, 0xcd, 0x83, 0xcd, 0x7d, - 0x45, 0x6d, 0xbf, 0xa7, 0x03, 0x67, 0x82, 0x72, 0x0c, 0xa2, 0x58, 0xa3, 0x7b, 0xb0, 0x1a, 0xd1, - 0x61, 0x1c, 0x52, 0xe1, 0x2f, 0xef, 0xd6, 0xf6, 0x9a, 0x07, 0x2d, 0xb3, 0xfd, 0xa9, 0x76, 0x62, - 0x17, 0x44, 0x1f, 0xc2, 0x9a, 0x90, 0x8c, 0x93, 0x3e, 0x15, 0xfe, 0x8a, 0xde, 0xd8, 0x76, 0xb8, - 0xda, 0x8b, 0x8b, 0x30, 0xba, 0x03, 0xb5, 0xd3, 0xa3, 0x13, 0xbf, 0xae, 0xb3, 0x83, 0xdd, 0x95, - 0xd1, 0x10, 0x2b, 0x77, 0xf0, 0x08, 0x6e, 0xf5, 0x24, 0xe1, 0xf2, 0x1a, 0x85, 0x07, 0x67, 0xb0, - 0x8d, 0x69, 0xc2, 0x86, 0xd7, 0xea, 0x9a, 0x0f, 0xab, 0x32, 0x4e, 0x28, 0xcb, 0xa5, 0xee, 0x5a, - 0x1b, 0x3b, 0x33, 0xf8, 0xd5, 0x03, 0xf4, 0xec, 0x25, 0x0d, 0xbb, 0x9c, 0x85, 0x54, 0x88, 0xff, - 0xe8, 0x24, 0xee, 0xc3, 0x6a, 0x66, 0x08, 0xf8, 0xcb, 0x7a, 0xbb, 0x6d, 0xb0, 0x63, 0xe5, 0xa2, - 0xc1, 0xf7, 0x70, 0xb3, 0x17, 0xf7, 0x53, 0x32, 0x58, 0x20, 0xdf, 0x6d, 0xa8, 0x0b, 0x8d, 0xa9, - 0xa9, 0xb6, 0xb1, 0xb5, 0x82, 0x2e, 0xa0, 0xe7, 0x24, 0x96, 0x8b, 0xcb, 0x14, 0x3c, 0x80, 0xad, + 0xbf, 0xb5, 0xd7, 0x5e, 0x17, 0xa9, 0xb5, 0xc4, 0x95, 0xe7, 0x9c, 0x33, 0xfe, 0xce, 0x77, 0xce, + 0xce, 0x9c, 0xf9, 0xa0, 0x49, 0x86, 0x34, 0x95, 0xfb, 0x19, 0x67, 0x92, 0xa1, 0xe5, 0x21, 0xcf, + 0xc2, 0x4e, 0x83, 0x85, 0xb1, 0x71, 0x74, 0x6e, 0x0f, 0x19, 0x1b, 0x8e, 0xe8, 0x43, 0x6d, 0x9d, + 0xe5, 0xe7, 0x0f, 0x69, 0x92, 0xc9, 0x6b, 0x13, 0x0c, 0xfe, 0xf6, 0x60, 0xbb, 0xcb, 0x29, 0x91, + 0xb4, 0xcb, 0x52, 0x49, 0xe2, 0x94, 0x72, 0x4c, 0x7f, 0xcc, 0xa9, 0x90, 0xe8, 0x5d, 0x68, 0x85, + 0xce, 0x37, 0x88, 0x23, 0xdf, 0xdb, 0xf5, 0xf6, 0x1a, 0xb8, 0x59, 0xf8, 0x8e, 0x23, 0xb4, 0x03, + 0xab, 0xf4, 0x05, 0x0d, 0x55, 0x74, 0x49, 0x47, 0xeb, 0xca, 0x3c, 0x8e, 0xd0, 0xc7, 0xd0, 0x14, + 0x92, 0xc7, 0xe9, 0x70, 0x90, 0x0b, 0xca, 0xfd, 0xda, 0xae, 0xb7, 0xd7, 0x3c, 0xd8, 0xdc, 0x57, + 0xd4, 0xf6, 0xfb, 0x3a, 0x70, 0x2a, 0x28, 0xc7, 0x20, 0x8a, 0x35, 0xba, 0x07, 0xab, 0x11, 0xbd, + 0x8c, 0x43, 0x2a, 0xfc, 0xe5, 0xdd, 0xda, 0x5e, 0xf3, 0xa0, 0x65, 0xb6, 0x3f, 0xd5, 0x4e, 0xec, + 0x82, 0xe8, 0x43, 0x58, 0x13, 0x92, 0x71, 0x32, 0xa4, 0xc2, 0x5f, 0xd1, 0x1b, 0xdb, 0x0e, 0x57, + 0x7b, 0x71, 0x11, 0x46, 0x77, 0xa0, 0x76, 0xd2, 0x3d, 0xf6, 0xeb, 0x3a, 0x3b, 0xd8, 0x5d, 0x19, + 0x0d, 0xb1, 0x72, 0x07, 0x8f, 0xe0, 0x56, 0x5f, 0x12, 0x2e, 0xdf, 0xa0, 0xf0, 0xe0, 0x14, 0xb6, + 0x31, 0x4d, 0xd8, 0xe5, 0x1b, 0x75, 0xcd, 0x87, 0x55, 0x19, 0x27, 0x94, 0xe5, 0x52, 0x77, 0xad, + 0x8d, 0x9d, 0x19, 0xfc, 0xea, 0x01, 0x7a, 0xf6, 0x82, 0x86, 0x3d, 0xce, 0x42, 0x2a, 0xc4, 0x7f, + 0xf4, 0x25, 0xee, 0xc3, 0x6a, 0x66, 0x08, 0xf8, 0xcb, 0x7a, 0xbb, 0x6d, 0xb0, 0x63, 0xe5, 0xa2, + 0xc1, 0xf7, 0x70, 0xb3, 0x1f, 0x0f, 0x53, 0x32, 0x5a, 0x20, 0xdf, 0x6d, 0xa8, 0x0b, 0x8d, 0xa9, + 0xa9, 0xb6, 0xb1, 0xb5, 0x82, 0x1e, 0xa0, 0xe7, 0x24, 0x96, 0x8b, 0xcb, 0x14, 0x3c, 0x80, 0xad, 0x12, 0xa2, 0xc8, 0x58, 0x2a, 0xa8, 0x26, 0x20, 0x89, 0xcc, 0x85, 0x06, 0x5b, 0xc1, 0xd6, 0x0a, - 0x22, 0x40, 0xcf, 0x79, 0x2c, 0x69, 0x4f, 0x72, 0x4a, 0x92, 0x45, 0x94, 0x8a, 0x60, 0x39, 0x22, + 0x22, 0x40, 0xcf, 0x79, 0x2c, 0x69, 0x5f, 0x72, 0x4a, 0x92, 0x45, 0x94, 0x8a, 0x60, 0x39, 0x22, 0x92, 0xe8, 0x42, 0x5b, 0x58, 0xaf, 0x83, 0xfb, 0xb0, 0x55, 0xca, 0x62, 0x49, 0x6d, 0x42, 0x6d, - 0x40, 0x53, 0x8d, 0xde, 0xc6, 0x6a, 0x19, 0x10, 0xb8, 0x81, 0x29, 0x89, 0x16, 0xc7, 0xc6, 0xa6, - 0xa8, 0x8d, 0x53, 0xec, 0x01, 0x9a, 0x4c, 0x61, 0xa9, 0x38, 0xd6, 0xde, 0x04, 0xeb, 0x53, 0xb8, - 0x71, 0x34, 0x60, 0x82, 0xf6, 0x64, 0x14, 0xa7, 0x8b, 0x38, 0x9b, 0x57, 0xb0, 0xf5, 0xad, 0x1c, - 0x3d, 0x57, 0x60, 0x22, 0xfe, 0x89, 0x2e, 0xa8, 0x3e, 0xce, 0xae, 0x5c, 0x7d, 0x9c, 0x5d, 0xa9, - 0x93, 0x0e, 0xd9, 0x20, 0x4f, 0x52, 0x7d, 0xcd, 0xdb, 0xd8, 0x5a, 0xc1, 0x2f, 0x1e, 0xdc, 0x34, - 0x33, 0xb1, 0x47, 0xd2, 0xe8, 0x05, 0x7b, 0xe9, 0xd2, 0x77, 0x60, 0xed, 0x92, 0x09, 0x99, 0x92, - 0x84, 0xda, 0xd4, 0x85, 0xad, 0xe0, 0xa3, 0x54, 0xf8, 0x4b, 0xbb, 0xb5, 0xbd, 0x06, 0x56, 0xcb, - 0xd2, 0xa0, 0xaa, 0xbd, 0x79, 0x50, 0xbd, 0x07, 0x6d, 0x61, 0x52, 0x9d, 0x67, 0xb1, 0x82, 0x51, - 0x84, 0xd6, 0x70, 0xcb, 0x3a, 0xbb, 0xca, 0x17, 0xec, 0xc0, 0xad, 0xa7, 0x54, 0x48, 0xce, 0x46, - 0x65, 0x5a, 0x01, 0x81, 0xc6, 0x49, 0xf7, 0x30, 0x8a, 0x38, 0x15, 0x02, 0xdd, 0x83, 0xfa, 0x05, - 0x49, 0xe2, 0xc1, 0x48, 0x33, 0x5c, 0x3f, 0x58, 0x37, 0x39, 0x4f, 0xba, 0x5f, 0x6b, 0x2f, 0xb6, - 0x51, 0x35, 0x84, 0x88, 0xf9, 0x8b, 0xed, 0x93, 0x33, 0xd5, 0x01, 0x27, 0x44, 0xfc, 0xa0, 0x3b, - 0xd5, 0xc0, 0x7a, 0xad, 0x5a, 0xd2, 0x38, 0x49, 0x25, 0xe5, 0x17, 0x24, 0xd4, 0x4f, 0xc4, 0x4c, - 0x63, 0xdb, 0x05, 0x6b, 0xa9, 0x7f, 0xea, 0xde, 0x18, 0x40, 0xbd, 0x56, 0xf3, 0xa7, 0x20, 0x57, - 0x34, 0x62, 0xc3, 0x91, 0xb2, 0x01, 0x3c, 0xb9, 0x47, 0xb5, 0x32, 0x91, 0xb9, 0xee, 0xc1, 0x32, - 0x56, 0x4b, 0x95, 0xf0, 0xf2, 0x4a, 0x6d, 0xf0, 0x57, 0x4c, 0x42, 0x63, 0x05, 0xaf, 0x60, 0x05, - 0xb3, 0x5c, 0x9a, 0x4b, 0x49, 0x85, 0xb4, 0x7c, 0xf4, 0x5a, 0x55, 0xd8, 0x27, 0x92, 0x5e, 0x91, - 0x91, 0xab, 0xd0, 0x9a, 0x13, 0xfc, 0x6b, 0x25, 0xfe, 0xea, 0xe9, 0xb3, 0x9c, 0x87, 0x54, 0xe7, - 0x6e, 0x60, 0x6b, 0xa1, 0x9b, 0xb0, 0x22, 0x42, 0x96, 0x51, 0x9d, 0xbd, 0x8d, 0x8d, 0x11, 0x3c, - 0x80, 0xba, 0x4e, 0xae, 0x8e, 0xcf, 0xae, 0x7c, 0x4f, 0x97, 0xd7, 0x34, 0xe5, 0x69, 0x1f, 0xb6, - 0xa1, 0xe0, 0x18, 0xb6, 0xcf, 0xb2, 0x88, 0x48, 0x5a, 0xf4, 0xd1, 0x5d, 0xab, 0x07, 0xd0, 0x88, - 0x9d, 0x4f, 0x57, 0x30, 0x6e, 0x50, 0xb1, 0x75, 0xbc, 0x23, 0x78, 0x0a, 0x5b, 0x87, 0x51, 0xf4, - 0xb6, 0x28, 0xc7, 0xee, 0x0b, 0xf6, 0xb6, 0x40, 0x5f, 0xc0, 0x96, 0xa9, 0xcb, 0xd4, 0xe9, 0x50, - 0xde, 0x87, 0x3a, 0x77, 0x3d, 0xf1, 0xc6, 0x5f, 0x73, 0xbb, 0xc9, 0xc6, 0x82, 0x5b, 0xb0, 0x75, - 0x9a, 0x0e, 0xe2, 0x94, 0x1e, 0x75, 0xcf, 0xbe, 0xa1, 0x6e, 0x8e, 0x05, 0xbf, 0x79, 0xb0, 0x6a, - 0x5f, 0x89, 0x3e, 0x2c, 0x1e, 0x0f, 0x29, 0x2f, 0x2e, 0x9b, 0xb6, 0xd0, 0x07, 0xb0, 0x6e, 0x56, - 0xe7, 0x2c, 0x93, 0x31, 0x2b, 0xde, 0x5e, 0xdb, 0x78, 0x4f, 0x8d, 0x73, 0xe2, 0x4c, 0x6b, 0xa5, - 0x33, 0xdd, 0x86, 0xfa, 0x85, 0x90, 0xa3, 0xac, 0x38, 0x6b, 0x63, 0xa9, 0x5b, 0xe3, 0xf0, 0x56, - 0x34, 0x9e, 0x33, 0xd1, 0x3b, 0xd0, 0x4c, 0x58, 0x9e, 0xca, 0xf3, 0x8c, 0xc5, 0xa9, 0xd4, 0xaa, - 0xa2, 0x81, 0x41, 0xbb, 0xba, 0xca, 0x13, 0xfc, 0xec, 0x41, 0xdd, 0xa8, 0x15, 0xb4, 0x0e, 0x4b, - 0xc5, 0x78, 0x5a, 0x8a, 0xf5, 0xa8, 0xd7, 0xb9, 0xec, 0xcb, 0xd0, 0x99, 0x76, 0x60, 0x75, 0x98, - 0x9c, 0x67, 0x44, 0x5e, 0x3a, 0x6a, 0xc3, 0xa4, 0x4b, 0xe4, 0xa5, 0xaa, 0x6c, 0x3c, 0xe5, 0x74, - 0xdc, 0x50, 0x6c, 0x17, 0x5e, 0xbd, 0x6d, 0x2e, 0xd3, 0xe0, 0x3b, 0x80, 0xf1, 0xa7, 0x5d, 0x3d, - 0xa7, 0xbc, 0x20, 0xa3, 0x96, 0xca, 0xd3, 0x2f, 0xe6, 0xa3, 0x5a, 0xa2, 0x7b, 0xb0, 0x4e, 0xa2, - 0x28, 0x56, 0x7f, 0x27, 0x83, 0xe3, 0x38, 0x32, 0x0f, 0xb5, 0x81, 0xa7, 0xbc, 0x1f, 0x75, 0x60, - 0xcd, 0x4d, 0x12, 0x54, 0x87, 0xa5, 0xe1, 0xa7, 0x9b, 0xff, 0xd3, 0xbf, 0x9f, 0x6d, 0x7a, 0x07, - 0xbf, 0x37, 0xa0, 0x75, 0xa8, 0x84, 0x68, 0x8f, 0x72, 0xdd, 0x84, 0x63, 0xd8, 0x98, 0x92, 0x96, - 0xe8, 0x8e, 0xb9, 0x05, 0xd5, 0x8a, 0xb3, 0xb3, 0xbd, 0x6f, 0xa4, 0xea, 0xbe, 0x93, 0xaa, 0xfb, - 0xcf, 0x94, 0x54, 0x45, 0xcf, 0x60, 0xbd, 0xac, 0xd4, 0xd0, 0x6d, 0x37, 0x49, 0x2b, 0xf4, 0xdb, - 0x5c, 0x98, 0x63, 0xd8, 0x98, 0x12, 0x6d, 0x8e, 0x4f, 0xb5, 0x96, 0x9b, 0x0b, 0xf4, 0x18, 0x9a, - 0x13, 0x2a, 0x0d, 0xf9, 0x06, 0x64, 0x56, 0xb8, 0xcd, 0x05, 0x38, 0x82, 0x76, 0x49, 0x38, 0xa1, - 0x8e, 0xad, 0xa7, 0x42, 0x4d, 0xcd, 0x05, 0x79, 0x02, 0xcd, 0x09, 0xfd, 0xe2, 0x58, 0xcc, 0x8a, - 0xa4, 0xce, 0xff, 0x2b, 0x22, 0xf6, 0x63, 0x7e, 0x08, 0x60, 0xe5, 0x46, 0x14, 0xa7, 0x05, 0xc4, - 0x8c, 0xcc, 0x29, 0x20, 0x2a, 0xa4, 0xc9, 0x63, 0x00, 0xa3, 0x12, 0x22, 0x96, 0x4b, 0xb4, 0xe3, - 0x1a, 0x3a, 0x25, 0x4d, 0x3a, 0xfe, 0x6c, 0x60, 0x06, 0x80, 0x72, 0x7e, 0x1d, 0x80, 0x2f, 0x01, - 0xc6, 0xea, 0xc3, 0x01, 0xcc, 0xe8, 0x91, 0xb9, 0x7d, 0x3c, 0x84, 0xd6, 0xa4, 0xd6, 0x40, 0xb6, - 0xd6, 0x0a, 0xfd, 0x31, 0x17, 0xe2, 0x11, 0xb4, 0x26, 0x47, 0xb2, 0x83, 0xa8, 0x18, 0xd3, 0x9d, - 0xe9, 0x51, 0x8a, 0xbe, 0x82, 0x8d, 0xa9, 0xef, 0x82, 0xbb, 0x95, 0xd5, 0x9f, 0x8b, 0x4a, 0x84, - 0xa9, 0x51, 0x5e, 0xbe, 0xd7, 0xff, 0x8e, 0xf0, 0x39, 0xb4, 0x26, 0x67, 0xb8, 0xe3, 0x5f, 0x31, - 0xd7, 0x3b, 0xa5, 0x39, 0xae, 0x2e, 0x72, 0x49, 0x29, 0xb9, 0x8b, 0x5c, 0x25, 0x9f, 0xde, 0xf4, - 0xbc, 0xcb, 0xc2, 0xc6, 0x3d, 0xef, 0x4a, 0xb9, 0xf3, 0xa6, 0x73, 0x9c, 0xfc, 0x96, 0xb8, 0x22, - 0x2a, 0xbe, 0x2f, 0xf3, 0x20, 0x9e, 0xb4, 0xfe, 0x78, 0x7d, 0xd7, 0xfb, 0xf3, 0xf5, 0x5d, 0xef, - 0xaf, 0xd7, 0x77, 0xbd, 0x17, 0x75, 0x1d, 0xfd, 0xe4, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x60, - 0xd6, 0x13, 0xd5, 0x5f, 0x0f, 0x00, 0x00, + 0x44, 0x53, 0x8d, 0xde, 0xc6, 0x6a, 0x19, 0x10, 0xb8, 0x81, 0x29, 0x89, 0x16, 0xc7, 0xc6, 0xa6, + 0xa8, 0x8d, 0x53, 0xec, 0x01, 0x9a, 0x4c, 0x61, 0xa9, 0x38, 0xd6, 0xde, 0x04, 0xeb, 0x13, 0xb8, + 0xd1, 0x1d, 0x31, 0x41, 0xfb, 0x32, 0x8a, 0xd3, 0x45, 0x7c, 0x9b, 0x97, 0xb0, 0xf5, 0xad, 0xbc, + 0x7e, 0xae, 0xc0, 0x44, 0xfc, 0x13, 0x5d, 0x50, 0x7d, 0x9c, 0x5d, 0xb9, 0xfa, 0x38, 0xbb, 0x52, + 0x5f, 0x3a, 0x64, 0xa3, 0x3c, 0x49, 0xf5, 0x31, 0x6f, 0x63, 0x6b, 0x05, 0xbf, 0x78, 0x70, 0xd3, + 0xcc, 0xc4, 0x3e, 0x49, 0xa3, 0x33, 0xf6, 0xc2, 0xa5, 0xef, 0xc0, 0xda, 0x05, 0x13, 0x32, 0x25, + 0x09, 0xb5, 0xa9, 0x0b, 0x5b, 0xc1, 0x47, 0xa9, 0xf0, 0x97, 0x76, 0x6b, 0x7b, 0x0d, 0xac, 0x96, + 0xa5, 0x41, 0x55, 0x7b, 0xfd, 0xa0, 0x7a, 0x0f, 0xda, 0xc2, 0xa4, 0x1a, 0x64, 0xb1, 0x82, 0x51, + 0x84, 0xd6, 0x70, 0xcb, 0x3a, 0x7b, 0xca, 0x17, 0xec, 0xc0, 0xad, 0xa7, 0x54, 0x48, 0xce, 0xae, + 0xcb, 0xb4, 0x02, 0x02, 0x8d, 0xe3, 0xde, 0x61, 0x14, 0x71, 0x2a, 0x04, 0xba, 0x07, 0xf5, 0x73, + 0x92, 0xc4, 0xa3, 0x6b, 0xcd, 0x70, 0xfd, 0x60, 0xdd, 0xe4, 0x3c, 0xee, 0x7d, 0xad, 0xbd, 0xd8, + 0x46, 0xd5, 0x10, 0x22, 0xe6, 0x2f, 0xb6, 0x4f, 0xce, 0x54, 0x1f, 0x38, 0x21, 0xe2, 0x07, 0xdd, + 0xa9, 0x06, 0xd6, 0x6b, 0xd5, 0x92, 0xc6, 0x71, 0x2a, 0x29, 0x3f, 0x27, 0xa1, 0xbe, 0x22, 0x66, + 0x1a, 0xdb, 0x2e, 0x58, 0x4b, 0xfd, 0x53, 0xf7, 0xc6, 0x00, 0xea, 0xb5, 0x9a, 0x3f, 0x05, 0xb9, + 0xa2, 0x11, 0x1b, 0x8e, 0x94, 0x0d, 0xe0, 0xc9, 0x3d, 0xaa, 0x95, 0x89, 0xcc, 0x75, 0x0f, 0x96, + 0xb1, 0x5a, 0xaa, 0x84, 0x17, 0x57, 0x6a, 0x83, 0xbf, 0x62, 0x12, 0x1a, 0x2b, 0x78, 0x09, 0x2b, + 0x98, 0xe5, 0xd2, 0x1c, 0x4a, 0x2a, 0xa4, 0xe5, 0xa3, 0xd7, 0xaa, 0xc2, 0x21, 0x91, 0xf4, 0x8a, + 0x5c, 0xbb, 0x0a, 0xad, 0x39, 0xc1, 0xbf, 0x56, 0xe2, 0xaf, 0xae, 0x3e, 0xcb, 0x79, 0x48, 0x75, + 0xee, 0x06, 0xb6, 0x16, 0xba, 0x09, 0x2b, 0x22, 0x64, 0x19, 0xd5, 0xd9, 0xdb, 0xd8, 0x18, 0xc1, + 0x03, 0xa8, 0xeb, 0xe4, 0xea, 0xf3, 0xd9, 0x95, 0xef, 0xe9, 0xf2, 0x9a, 0xa6, 0x3c, 0xed, 0xc3, + 0x36, 0x14, 0x1c, 0xc1, 0xf6, 0x69, 0x16, 0x11, 0x49, 0x8b, 0x3e, 0xba, 0x63, 0xf5, 0x00, 0x1a, + 0xb1, 0xf3, 0xe9, 0x0a, 0xc6, 0x0d, 0x2a, 0xb6, 0x8e, 0x77, 0x04, 0x4f, 0x61, 0xeb, 0x30, 0x8a, + 0xde, 0x16, 0xe5, 0xc8, 0xbd, 0x60, 0x6f, 0x0b, 0xf4, 0x05, 0x6c, 0x99, 0xba, 0x4c, 0x9d, 0x0e, + 0xe5, 0x7d, 0xa8, 0x73, 0xd7, 0x13, 0x6f, 0xfc, 0x9a, 0xdb, 0x4d, 0x36, 0x16, 0x3c, 0x81, 0xad, + 0x93, 0x74, 0x14, 0xa7, 0xb4, 0xdb, 0x3b, 0xfd, 0x86, 0x16, 0x73, 0x0c, 0xc1, 0xf2, 0x15, 0x89, + 0xcd, 0xe7, 0x5c, 0xc3, 0x7a, 0xad, 0x2e, 0x76, 0x7a, 0x36, 0x08, 0xb3, 0x5c, 0xd8, 0x57, 0xb3, + 0x9e, 0x9e, 0x75, 0xb3, 0x5c, 0x04, 0xbf, 0x79, 0xb0, 0x6a, 0xaf, 0x94, 0xfe, 0xb2, 0x3c, 0xbe, + 0xa4, 0xbc, 0x38, 0x99, 0xda, 0x42, 0x1f, 0xc0, 0xba, 0x59, 0x0d, 0x58, 0x26, 0x63, 0x56, 0x5c, + 0xd4, 0xb6, 0xf1, 0x9e, 0x18, 0xe7, 0xc4, 0x01, 0xa8, 0x95, 0x0e, 0xc0, 0x36, 0xd4, 0xcf, 0x85, + 0xbc, 0xce, 0x8a, 0x83, 0x61, 0x2c, 0x75, 0xc4, 0x1c, 0xde, 0x8a, 0xc6, 0x73, 0x26, 0x7a, 0x07, + 0x9a, 0x09, 0xcb, 0x53, 0x39, 0xc8, 0x58, 0x9c, 0x4a, 0x2d, 0x41, 0x1a, 0x18, 0xb4, 0xab, 0xa7, + 0x3c, 0xc1, 0xcf, 0x1e, 0xd4, 0x8d, 0xb4, 0x41, 0xeb, 0xb0, 0x54, 0xcc, 0xb2, 0xa5, 0x58, 0xbf, + 0x0b, 0x3a, 0x97, 0xbd, 0x46, 0x3a, 0xd3, 0x0e, 0xac, 0x5e, 0x26, 0x83, 0x8c, 0xc8, 0x0b, 0x47, + 0xed, 0x32, 0xe9, 0x11, 0x79, 0xa1, 0x2a, 0x1b, 0x8f, 0x44, 0x1d, 0x37, 0x14, 0xdb, 0x85, 0x57, + 0x6f, 0x9b, 0xcb, 0x34, 0xf8, 0x0e, 0x60, 0xac, 0x03, 0xd4, 0xdd, 0xcb, 0x0b, 0x32, 0x6a, 0xa9, + 0x3c, 0xc3, 0x62, 0x98, 0xaa, 0x25, 0xba, 0x07, 0xeb, 0x24, 0x8a, 0x62, 0xf5, 0x77, 0x32, 0x3a, + 0x8a, 0x23, 0x73, 0xab, 0x1b, 0x78, 0xca, 0xfb, 0x51, 0x07, 0xd6, 0xdc, 0xd8, 0x41, 0x75, 0x58, + 0xba, 0xfc, 0x74, 0xf3, 0x7f, 0xfa, 0xf7, 0xb3, 0x4d, 0xef, 0xe0, 0xf7, 0x06, 0xb4, 0x0e, 0x95, + 0x6a, 0xed, 0x53, 0xae, 0x9b, 0x70, 0x04, 0x1b, 0x53, 0x3a, 0x14, 0xdd, 0x31, 0x47, 0xa6, 0x5a, + 0x9e, 0x76, 0xb6, 0xf7, 0x8d, 0xae, 0xdd, 0x77, 0xba, 0x76, 0xff, 0x99, 0xd2, 0xb5, 0xe8, 0x19, + 0xac, 0x97, 0x65, 0x1d, 0xba, 0xed, 0xc6, 0x6e, 0x85, 0xd8, 0x9b, 0x0b, 0x73, 0x04, 0x1b, 0x53, + 0x0a, 0xcf, 0xf1, 0xa9, 0x16, 0x7e, 0x73, 0x81, 0x1e, 0x43, 0x73, 0x42, 0xd2, 0x21, 0xdf, 0x80, + 0xcc, 0xaa, 0xbc, 0xb9, 0x00, 0x5d, 0x68, 0x97, 0x54, 0x16, 0xea, 0xd8, 0x7a, 0x2a, 0xa4, 0xd7, + 0x5c, 0x90, 0x27, 0xd0, 0x9c, 0x10, 0x3b, 0x8e, 0xc5, 0xac, 0xa2, 0xea, 0xfc, 0xbf, 0x22, 0x62, + 0x5f, 0xfe, 0x43, 0x00, 0xab, 0x4d, 0xa2, 0x38, 0x2d, 0x20, 0x66, 0x34, 0x51, 0x01, 0x51, 0xa1, + 0x63, 0x1e, 0x03, 0x18, 0x49, 0x11, 0xb1, 0x5c, 0xa2, 0x1d, 0xd7, 0xd0, 0x29, 0x1d, 0xd3, 0xf1, + 0x67, 0x03, 0x33, 0x00, 0x94, 0xf3, 0x37, 0x01, 0xf8, 0x12, 0x60, 0x2c, 0x55, 0x1c, 0xc0, 0x8c, + 0x78, 0x99, 0xdb, 0xc7, 0x43, 0x68, 0x4d, 0x0a, 0x13, 0x64, 0x6b, 0xad, 0x10, 0x2b, 0x73, 0x21, + 0x1e, 0x41, 0x6b, 0x72, 0x7e, 0x3b, 0x88, 0x8a, 0x99, 0xde, 0x99, 0x9e, 0xbb, 0xe8, 0x2b, 0xd8, + 0x98, 0x7a, 0x44, 0xdc, 0xa9, 0xac, 0x7e, 0x5b, 0x2a, 0x11, 0xa6, 0xe6, 0x7e, 0xf9, 0x5c, 0xff, + 0x3b, 0xc2, 0xe7, 0xd0, 0x9a, 0x1c, 0xf8, 0x8e, 0x7f, 0xc5, 0x23, 0xd0, 0x29, 0x0d, 0x7d, 0x75, + 0x90, 0x4b, 0xb2, 0xca, 0x1d, 0xe4, 0x2a, 0xad, 0xf5, 0xba, 0xeb, 0x5d, 0x56, 0x41, 0xee, 0x7a, + 0x57, 0x6a, 0xa3, 0xd7, 0x7d, 0xc7, 0xc9, 0x87, 0xc7, 0x15, 0x51, 0xf1, 0x18, 0xcd, 0x83, 0x78, + 0xd2, 0xfa, 0xe3, 0xd5, 0x5d, 0xef, 0xcf, 0x57, 0x77, 0xbd, 0xbf, 0x5e, 0xdd, 0xf5, 0xce, 0xea, + 0x3a, 0xfa, 0xc9, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xdb, 0x8b, 0xb0, 0x9a, 0x8c, 0x0f, 0x00, + 0x00, }