77250 2012-01-27 15:22:08 -0800 webkit-perf.appspot.com should have an ability to merge tests 2012-01-30 15:06:47 -0800 1 1 1 Unclassified WebKit WebKit Website 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 77037 1 rniwa rniwa abarth eric ojan tony webkit.review.bot oldest_to_newest 544428 0 rniwa 2012-01-27 15:22:08 -0800 When tests are moved or renamed, we need to merge multiple Test objects. Provide an interface to do this on an admin page. 544469 1 124388 rniwa 2012-01-27 15:55:46 -0800 Created attachment 124388 Adds admin/merge-tests 544474 2 webkit.review.bot 2012-01-27 16:00:21 -0800 Attachment 124388 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'ChangeLog', u'Websites/webkit-perf.appspot..." exit_code: 1 Websites/webkit-perf.appspot.com/merge_tests_handler.py:45: multiple statements on one line (semicolon) [pep8/E702] [5] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 544476 3 rniwa 2012-01-27 16:02:05 -0800 The style error is caused by ";" in content-type http header. Unfortunately, we use a third-party script for python style check so it's non-trivial to fix it. 545385 4 rniwa 2012-01-30 13:53:59 -0800 Ping reviewers. This patch is blocking my patch to add memcache. 545408 5 124388 abarth 2012-01-30 14:23:07 -0800 Comment on attachment 124388 Adds admin/merge-tests I'm not sure what sort of review you're looking for here. Generally, we use PEP8 style in our python (but without the 80 col limit). Names like mergedResults don't match that style, but given that this is an addition to code imported from Mozilla, we should probably match their style. Are you planning to contribute these changes upstream? In any case, I'm inclined to rubber-stamp these sorts of changes. 545435 6 rniwa 2012-01-30 14:51:17 -0800 Thanks for the review. (In reply to comment #5) > (From update of attachment 124388 [details]) > I'm not sure what sort of review you're looking for here. Generally, we use PEP8 style in our python (but without the 80 col limit). Names like mergedResults don't match that style, but given that this is an addition to code imported from Mozilla, we should probably match their style. They use names with underscores? I can change them since all the python code I'm checking into webkit won't be shared with Mozilla. > Are you planning to contribute these changes upstream? No. Python backend is specific to WebKit. In fact, all patches I've contributed so far only contains WebKit-specific code. As I've outlined in http://trac.webkit.org/changeset/105971, we need to import some code from https://github.com/mozilla/graphs but it's all in front-end (css, js, html). 545440 7 abarth 2012-01-30 14:55:00 -0800 > They use names with underscores? I can change them since all the python code I'm checking into webkit won't be shared with Mozilla. Yeah. I'm surprised check-webkit-style didn't complain. (Maybe it stops at the first error in each file?) 545446 8 124388 rniwa 2012-01-30 15:06:44 -0800 Comment on attachment 124388 Adds admin/merge-tests Clearing flags on attachment: 124388 Committed r106292: <http://trac.webkit.org/changeset/106292> 545447 9 rniwa 2012-01-30 15:06:47 -0800 All reviewed patches have been landed. Closing bug. 124388 2012-01-27 15:55:46 -0800 2012-01-30 15:06:44 -0800 Adds admin/merge-tests bug-77250-20120127155545.patch text/plain 13950 rniwa SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDEwNjE2 MCkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAx LTI3ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIHdlYmtpdC1w ZXJmLmFwcHNwb3QuY29tIHNob3VsZCBoYXZlIGFuIGFiaWxpdHkgdG8gbWVyZ2UgdGVzdHMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc3MjUwCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgYWRtaW4v bWVyZ2UtdGVzdHMuIFRoaXMgcGFnZSBhbGxvd3MgYWRtaW5pc3RyYXRvcnMgdG8gZWFzaWx5IG1l cmdlIHRlc3Qgb2JqZWN0cy4KKworICAgICAgICBBbHNvIGFkZCB0aGUgZm9yZ290dGVuIHRpdGxl LnBuZyBhbmQgcmVuYW1lIGFwaS9jcmVhdGUgdG8gYWRtaW4vY3JlYXRlIHNpbmNlIHdlIGRvbid0 IGFsbG93CisgICAgICAgIG5vbi1hZG1pbnMgdG8gY3JlYXRlIG5ldyBtb2RlbHMgYW55d2F5Lgor CisgICAgICAgICogV2Vic2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5jb20vYXBwLnlhbWw6Cisg ICAgICAgICogV2Vic2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5jb20vY3NzOiBBZGRlZC4KKyAg ICAgICAgKiBXZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90LmNvbS9jc3MvdGl0bGUucG5nOiBB ZGRlZC4KKyAgICAgICAgKiBXZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90LmNvbS9tYWluLnB5 OgorICAgICAgICAqIFdlYnNpdGVzL3dlYmtpdC1wZXJmLmFwcHNwb3QuY29tL21lcmdlX3Rlc3Rz LnlhbWw6IEFkZGVkLgorICAgICAgICAqIFdlYnNpdGVzL3dlYmtpdC1wZXJmLmFwcHNwb3QuY29t L21lcmdlX3Rlc3RzX2hhbmRsZXIucHk6IEFkZGVkLgorICAgICAgICAoTWVyZ2VUZXN0SGFuZGxl cik6CisgICAgICAgIChNZXJnZVRlc3RIYW5kbGVyLmdldCk6CisgICAgICAgIChNZXJnZVRlc3RI YW5kbGVyLnBvc3QpOgorICAgICAgICAqIFdlYnNpdGVzL3dlYmtpdC1wZXJmLmFwcHNwb3QuY29t L21vZGVscy5weToKKyAgICAgICAgKGRlbGV0ZU1vZGVsV2l0aE51bWVyaWNJZEhvbGRlcik6Cisg ICAgICAgICogV2Vic2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5jb20vc3RhdGljL2NyZWF0ZS1t b2RlbHMuaHRtbDoKKwogMjAxMi0wMS0yNyAgRmFkeSBTYW11ZWwgIDxmc2FtdWVsQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZW5hbWUgc2hvdWxkTGF5b3V0Rml4ZWRFbGVtZW50c1JlbGF0aXZl VG9GcmFtZSBhbmQgbWFrZSBpdCBhIHNldHRpbmcKSW5kZXg6IFdlYnNpdGVzL3dlYmtpdC1wZXJm LmFwcHNwb3QuY29tL2FwcC55YW1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNpdGVzL3dlYmtpdC1wZXJm LmFwcHNwb3QuY29tL2FwcC55YW1sCShyZXZpc2lvbiAxMDU5NzEpCisrKyBXZWJzaXRlcy93ZWJr aXQtcGVyZi5hcHBzcG90LmNvbS9hcHAueWFtbAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUg QEAKIGFwcGxpY2F0aW9uOiB3ZWJraXQtcGVyZgotdmVyc2lvbjogOAordmVyc2lvbjogOQogcnVu dGltZTogcHl0aG9uMjcKIGFwaV92ZXJzaW9uOiAxCiB0aHJlYWRzYWZlOiBmYWxzZQpAQCAtOSw3 ICs5LDcgQEAgaGFuZGxlcnM6CiAgIHN0YXRpY19maWxlczogZmF2aWNvbi5pY28KICAgdXBsb2Fk OiBmYXZpY29uXC5pY28KIAotLSB1cmw6IC9hZG1pbi8oKC4rKVwuaHRtbCkKKy0gdXJsOiAvYWRt aW4vKC4rXC5odG1sKQogICBzdGF0aWNfZmlsZXM6IHN0YXRpYy9cMQogICB1cGxvYWQ6IHN0YXRp YwogICBzZWN1cmU6IGFsd2F5cwpAQCAtMzYsMTIgKzM2LDcgQEAgaGFuZGxlcnM6CiAgIHNjcmlw dDogbWFpbi5weQogICBzZWN1cmU6IGFsd2F5cwogCi0tIHVybDogL2FkbWluL3JlcG9ydAotICBz Y3JpcHQ6IG1haW4ucHkKLSAgc2VjdXJlOiBhbHdheXMKLSAgbG9naW46IGFkbWluCi0KLS0gdXJs OiAvYXBpL2NyZWF0ZS8oXHcrKQorLSB1cmw6IC9hZG1pbi8KICAgc2NyaXB0OiBtYWluLnB5CiAg IHNlY3VyZTogYWx3YXlzCiAgIGxvZ2luOiBhZG1pbgpJbmRleDogV2Vic2l0ZXMvd2Via2l0LXBl cmYuYXBwc3BvdC5jb20vbWFpbi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy93ZWJraXQtcGVy Zi5hcHBzcG90LmNvbS9tYWluLnB5CShyZXZpc2lvbiAxMDU5NzEpCisrKyBXZWJzaXRlcy93ZWJr aXQtcGVyZi5hcHBzcG90LmNvbS9tYWluLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNiwxMiArMjYs MTQgQEAgZnJvbSBtYW5pZmVzdF9oYW5kbGVyIGltcG9ydCBNYW5pZmVzdEhhbgogZnJvbSByZXBv cnRfaGFuZGxlciBpbXBvcnQgUmVwb3J0SGFuZGxlcgogZnJvbSByZXBvcnRfaGFuZGxlciBpbXBv cnQgQWRtaW5SZXBvcnRIYW5kbGVyCiBmcm9tIHJ1bnNfaGFuZGxlciBpbXBvcnQgUnVuc0hhbmRs ZXIKK2Zyb20gbWVyZ2VfdGVzdHNfaGFuZGxlciBpbXBvcnQgTWVyZ2VUZXN0c0hhbmRsZXIKIAog cm91dGVzID0gWwotICAgICgnL2FwaS9jcmVhdGUvKC4qKScsIENyZWF0ZUhhbmRsZXIpLAorICAg ICgnL2FkbWluL3JlcG9ydC8/JywgQWRtaW5SZXBvcnRIYW5kbGVyKSwKKyAgICAoJy9hZG1pbi9t ZXJnZS10ZXN0cy8/JywgTWVyZ2VUZXN0c0hhbmRsZXIpLAorICAgICgnL2FkbWluL2NyZWF0ZS8o LiopJywgQ3JlYXRlSGFuZGxlciksCiAgICAgKCcvYXBpL3Rlc3QvPycsIE1hbmlmZXN0SGFuZGxl ciksCiAgICAgKCcvYXBpL3Rlc3QvcmVwb3J0Lz8nLCBSZXBvcnRIYW5kbGVyKSwKLSAgICAoJy9h ZG1pbi9yZXBvcnQvPycsIEFkbWluUmVwb3J0SGFuZGxlciksCiAgICAgKCcvYXBpL3Rlc3QvcnVu cy8/JywgUnVuc0hhbmRsZXIpLAogICAgICgnL2FwaS90ZXN0L2Rhc2hib2FyZC8/JywgRGFzaGJv YXJkSGFuZGxlciksCiBdCkluZGV4OiBXZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90LmNvbS9t ZXJnZV90ZXN0cy55YW1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNpdGVzL3dlYmtpdC1wZXJmLmFwcHNw b3QuY29tL21lcmdlX3Rlc3RzLnlhbWwJKHJldmlzaW9uIDApCisrKyBXZWJzaXRlcy93ZWJraXQt cGVyZi5hcHBzcG90LmNvbS9tZXJnZV90ZXN0cy55YW1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsx LDI1IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGJvZHk+Cis8aDE+TWVyZ2UgdGVzdHM8 L2gxPgorPGZvcm0gbWV0aG9kPSJwb3N0IiBhY3Rpb249Ii9hZG1pbi9tZXJnZS10ZXN0cyI+CisK KzxsYWJlbCBmb3I9Im1lcmdlIj5NZXJnZTwvbGFiZWw+OgorPHNlbGVjdCBpZD0ibWVyZ2UiIG5h bWU9Im1lcmdlIj4KK3slIGZvciB0ZXN0IGluIHRlc3RzICV9CisgICAgPG9wdGlvbiB2YWx1ZT0i e3sgdGVzdC5uYW1lIH19Ij57eyB0ZXN0Lm5hbWUgfX08L29wdGlvbj4KK3slIGVuZGZvciAlfQor PC9zZWxlY3Q+CisKKzxsYWJlbCBmb3I9ImludG8iPkludG88L2xhYmVsPjoKKzxzZWxlY3QgaWQ9 ImludG8iIG5hbWU9ImludG8iPgoreyUgZm9yIHRlc3QgaW4gdGVzdHMgJX0KKyAgICA8b3B0aW9u IHZhbHVlPSJ7eyB0ZXN0Lm5hbWUgfX0iPnt7IHRlc3QubmFtZSB9fTwvb3B0aW9uPgoreyUgZW5k Zm9yICV9Cis8L3NlbGVjdD4KKworPGJ1dHRvbiB0eXBlPSJzdWJtaXQiPk1lcmdlPC9idXR0b24+ CisKKzwvZm9ybT4KKzwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IFdlYnNpdGVzL3dlYmtpdC1wZXJm LmFwcHNwb3QuY29tL21lcmdlX3Rlc3RzX2hhbmRsZXIucHkKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0 ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5jb20vbWVyZ2VfdGVzdHNfaGFuZGxlci5weQkocmV2aXNp b24gMCkKKysrIFdlYnNpdGVzL3dlYmtpdC1wZXJmLmFwcHNwb3QuY29tL21lcmdlX3Rlc3RzX2hh bmRsZXIucHkJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNjEgQEAKKyMhL3Vzci9iaW4vZW52IHB5 dGhvbgorIyBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyMgbWV0OgorIworIyAgICAgKiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorIyBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIuCisjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0 IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyMgY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorIyBpbiB0aGUgZG9jdW1lbnRh dGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisjIGRpc3RyaWJ1 dGlvbi4KKyMgICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5h bWVzIG9mIGl0cworIyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9t b3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQorIyB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lm aWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJ REVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisjICJBUyBJUyIg QU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9U CisjIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZ IEFORCBGSVRORVNTIEZPUgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4g SU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorIyBPV05FUiBPUiBDT05UUklCVVRPUlMg QkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyMgU1BFQ0lB TCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5P VAorIyBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJ Q0VTOyBMT1NTIE9GIFVTRSwKKyMgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJS VVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisjIFRIRU9SWSBPRiBMSUFCSUxJVFks IFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xV RElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBU SEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKK2ltcG9ydCB3ZWJhcHAyCitmcm9tIGdvb2dsZS5hcHBl bmdpbmUuZXh0LndlYmFwcCBpbXBvcnQgdGVtcGxhdGUKKworaW1wb3J0IG9zCisKK2Zyb20gbW9k ZWxzIGltcG9ydCBUZXN0Citmcm9tIG1vZGVscyBpbXBvcnQgVGVzdFJlc3VsdAorZnJvbSBtb2Rl bHMgaW1wb3J0IGRlbGV0ZU1vZGVsV2l0aE51bWVyaWNJZEhvbGRlcgorCisKK2NsYXNzIE1lcmdl VGVzdHNIYW5kbGVyKHdlYmFwcDIuUmVxdWVzdEhhbmRsZXIpOgorICAgIGRlZiBnZXQoc2VsZik6 CisgICAgICAgIHNlbGYucmVzcG9uc2Uub3V0LndyaXRlKHRlbXBsYXRlLnJlbmRlcignbWVyZ2Vf dGVzdHMueWFtbCcsIHsndGVzdHMnOiBUZXN0LmFsbCgpfSkpCisKKyAgICBkZWYgcG9zdChzZWxm KToKKyAgICAgICAgc2VsZi5yZXNwb25zZS5oZWFkZXJzWydDb250ZW50LVR5cGUnXSA9ICd0ZXh0 L3BsYWluOyBjaGFyc2V0PXV0Zi04JzsKKworICAgICAgICBtZXJnZSA9IFRlc3QuZ2V0X2J5X2tl eV9uYW1lKHNlbGYucmVxdWVzdC5nZXQoJ21lcmdlJykpCisgICAgICAgIGludG8gPSBUZXN0Lmdl dF9ieV9rZXlfbmFtZShzZWxmLnJlcXVlc3QuZ2V0KCdpbnRvJykpCisgICAgICAgIGlmIG5vdCBt ZXJnZSBvciBub3QgaW50bzoKKyAgICAgICAgICAgIHNlbGYucmVzcG9uc2Uub3V0LndyaXRlKCdJ bnZhbGlkIHRlc3QgbmFtZXMnKQorICAgICAgICAgICAgcmV0dXJuCisKKyAgICAgICAgbWVyZ2Vk UmVzdWx0cyA9IFRlc3RSZXN1bHQuYWxsKCkKKyAgICAgICAgbWVyZ2VkUmVzdWx0cy5maWx0ZXIo J25hbWUgPScsIG1lcmdlLm5hbWUpCisgICAgICAgIGZvciByZXN1bHQgaW4gbWVyZ2VkUmVzdWx0 czoKKyAgICAgICAgICAgIHJlc3VsdC5uYW1lID0gaW50by5uYW1lCisgICAgICAgICAgICByZXN1 bHQucHV0KCkKKworICAgICAgICBkZWxldGVNb2RlbFdpdGhOdW1lcmljSWRIb2xkZXIobWVyZ2Up CisKKyAgICAgICAgc2VsZi5yZXNwb25zZS5vdXQud3JpdGUoJ09LJykKSW5kZXg6IFdlYnNpdGVz L3dlYmtpdC1wZXJmLmFwcHNwb3QuY29tL21vZGVscy5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRl cy93ZWJraXQtcGVyZi5hcHBzcG90LmNvbS9tb2RlbHMucHkJKHJldmlzaW9uIDEwNTk3MSkKKysr IFdlYnNpdGVzL3dlYmtpdC1wZXJmLmFwcHNwb3QuY29tL21vZGVscy5weQkod29ya2luZyBjb3B5 KQpAQCAtNTEsNiArNTEsMTIgQEAgZGVmIGNyZWF0ZUluVHJhbnNhY3Rpb25XaXRoTnVtZXJpY0lk SG9sZAogICAgIHJldHVybiBvd25lcgogCiAKK2RlZiBkZWxldGVNb2RlbFdpdGhOdW1lcmljSWRI b2xkZXIobW9kZWwpOgorICAgIGlkSG9sZGVyID0gTnVtZXJpY0lkSG9sZGVyLmdldF9ieV9pZCht b2RlbC5pZCkKKyAgICBtb2RlbC5kZWxldGUoKQorICAgIGlkSG9sZGVyLmRlbGV0ZSgpCisKKwog ZGVmIG1vZGVsRnJvbU51bWVyaWNJZChpZCwgZXhwZWN0ZWRLaW5kKToKICAgICBpZEhvbGRlciA9 IE51bWVyaWNJZEhvbGRlci5nZXRfYnlfaWQoaWQpCiAgICAgcmV0dXJuIGlkSG9sZGVyLm93bmVy IGlmIGlkSG9sZGVyIGFuZCBpZEhvbGRlci5vd25lciBhbmQgaXNpbnN0YW5jZShpZEhvbGRlci5v d25lciwgZXhwZWN0ZWRLaW5kKSBlbHNlIE5vbmUKSW5kZXg6IFdlYnNpdGVzL3dlYmtpdC1wZXJm LmFwcHNwb3QuY29tL3N0YXRpYy9jcmVhdGUtbW9kZWxzLmh0bWwKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi c2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5jb20vc3RhdGljL2NyZWF0ZS1tb2RlbHMuaHRtbAko cmV2aXNpb24gMTA1OTcxKQorKysgV2Vic2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5jb20vc3Rh dGljL2NyZWF0ZS1tb2RlbHMuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMTQsMjEgKzE0LDIxIEBA IGgzIHtmb250LXNpemU6IDFlbTt9CiA8cD5LZXk6IGNhbm9uaWNhbGl6ZWQgbmFtZSB1c2VkIGJ5 IGJ1aWxkIGJvdHMgYW5kIHN0b3JhZ2UuIE5hbWU6IGh1bWFuIGZyaWVuZGx5IG5hbWU8L3A+CiAK IDxoMj5CdWlsZGVyPC9oMj4KLTxmb3JtIG1ldGhvZD0icG9zdCIgYWN0aW9uPSIvYXBpL2NyZWF0 ZS9idWlsZGVyIiBvbnN1Ym1pdD0icmV0dXJuIHN1Ym1pdEJ5WEhSKHRoaXMsIGV2ZW50KSI+Cis8 Zm9ybSBtZXRob2Q9InBvc3QiIGFjdGlvbj0iL2FkbWluL2NyZWF0ZS9idWlsZGVyIiBvbnN1Ym1p dD0icmV0dXJuIHN1Ym1pdEJ5WEhSKHRoaXMsIGV2ZW50KSI+CiA8bGFiZWwgZm9yPSJuYW1lIj5O YW1lL0tleTwvbGFiZWw+PGlucHV0IHR5cGU9InRleHQiIG5hbWU9Im5hbWUiPgogPGxhYmVsIGZv cj0icGFzc3dvcmQiPlBhc3N3b3JkPC9sYWJlbD48aW5wdXQgdHlwZT0icGFzc3dvcmQiIG5hbWU9 InBhc3N3b3JkIj4KIDxidXR0b24gdHlwZT0ic3VibWl0Ij5DcmVhdGU8L2J1dHRvbj4KIDwvZm9y bT4KIAogPGgyPkJyYW5jaDwvaDI+Ci08Zm9ybSBtZXRob2Q9InBvc3QiIGFjdGlvbj0iL2FwaS9j cmVhdGUvYnJhbmNoIiBvbnN1Ym1pdD0icmV0dXJuIHN1Ym1pdEJ5WEhSKHRoaXMsIGV2ZW50KTsi PgorPGZvcm0gbWV0aG9kPSJwb3N0IiBhY3Rpb249Ii9hZG1pbi9jcmVhdGUvYnJhbmNoIiBvbnN1 Ym1pdD0icmV0dXJuIHN1Ym1pdEJ5WEhSKHRoaXMsIGV2ZW50KTsiPgogPGxhYmVsIGZvcj0ia2V5 Ij5LZXk8L2xhYmVsPjxpbnB1dCB0eXBlPSJ0ZXh0IiBuYW1lPSJrZXkiPgogPGxhYmVsIGZvcj0i bmFtZSI+TmFtZTwvbGFiZWw+PGlucHV0IHR5cGU9InRleHQiIG5hbWU9Im5hbWUiPgogPGJ1dHRv biB0eXBlPSJzdWJtaXQiPkNyZWF0ZTwvYnV0dG9uPgogPC9mb3JtPgogCiA8aDI+UGxhdGZvcm08 L2gyPgotPGZvcm0gbWV0aG9kPSJwb3N0IiBhY3Rpb249Ii9hcGkvY3JlYXRlL3BsYXRmb3JtIiBv bnN1Ym1pdD0icmV0dXJuIHN1Ym1pdEJ5WEhSKHRoaXMsIGV2ZW50KSI+Cis8Zm9ybSBtZXRob2Q9 InBvc3QiIGFjdGlvbj0iL2FkbWluL2NyZWF0ZS9wbGF0Zm9ybSIgb25zdWJtaXQ9InJldHVybiBz dWJtaXRCeVhIUih0aGlzLCBldmVudCkiPgogPGxhYmVsIGZvcj0ia2V5Ij5LZXk8L2xhYmVsPjxp bnB1dCB0eXBlPSJ0ZXh0IiBuYW1lPSJrZXkiPgogPGxhYmVsIGZvcj0ibmFtZSI+TmFtZTwvbGFi ZWw+PGlucHV0IHR5cGU9InRleHQiIG5hbWU9Im5hbWUiPgogPGJ1dHRvbiB0eXBlPSJzdWJtaXQi PkNyZWF0ZTwvYnV0dG9uPgpJbmRleDogV2Vic2l0ZXMvd2Via2l0LXBlcmYuYXBwc3BvdC5jb20v c3RhdGljL21hbnVhbC1zdWJtaXQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy93ZWJraXQt cGVyZi5hcHBzcG90LmNvbS9zdGF0aWMvbWFudWFsLXN1Ym1pdC5odG1sCShyZXZpc2lvbiAxMDU5 NzEpCisrKyBXZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90LmNvbS9zdGF0aWMvbWFudWFsLXN1 Ym1pdC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC01Miw3ICs1Miw3IEBAIGZ1bmN0aW9uIHN1Ym1p dCgpIHsKICQoJ2RhdGEnKS52YWx1ZSA9IEpTT04uc3RyaW5naWZ5KHsKICAgICAnYnJhbmNoJzog J3dlYmtpdC10cnVuaycsCiAgICAgJ3BsYXRmb3JtJzogJ2Nocm9taXVtLW1hYycsCi0gICAgJ2J1 aWxkZXItbmFtZSc6ICdnb29nbGUtbWFjLTInLAorICAgICdidWlsZGVyLW5hbWUnOiAnQ2hyb21p dW0gTWFjIFJlbGVhc2UgKFBlcmYpJywKICAgICAnYnVpbGQtbnVtYmVyJzogJzEyMycsCiAgICAg J3RpbWVzdGFtcCc6IHBhcnNlSW50KERhdGUubm93KCkgLyAxMDAwKSwKICAgICAncmV2aXNpb24n OiAxMDQ4NTYsCkluZGV4OiBXZWJzaXRlcy93ZWJraXQtcGVyZi5hcHBzcG90LmNvbS9jc3MvdGl0 bGUucG5nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KQ2Fubm90IGRpc3BsYXk6IGZpbGUgbWFya2VkIGFzIGEgYmluYXJ5 IHR5cGUuCnN2bjptaW1lLXR5cGUgPSBhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0KClByb3BlcnR5 IGNoYW5nZXMgb246IFdlYnNpdGVzL3dlYmtpdC1wZXJmLmFwcHNwb3QuY29tL2Nzcy90aXRsZS5w bmcKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpBZGRlZDogc3ZuOm1pbWUtdHlwZQogICArIGFwcGxpY2F0aW9uL29jdGV0 LXN0cmVhbQoKCmlWQk9SdzBLR2dvQUFBQU5TVWhFVWdBQUFUVUFBQUFVQ0FNQUFBRGJSbG9SQUFB QUdYUkZXSFJUYjJaMGQyRnlaUUJCWkc5aVpTQkoKYldGblpWSmxZV1I1Y2NsbFBBQUFBd0JRVEZS RlRGMTNVMVZZanBxdFVYR2hUV1dJMmRuWmNvcXVRMHBUQmhFaXpzN09MREExa3FiRgptcXJCRENS SkpVNkxZMjE3Q0JzMmIzbUtmWkt4UkdlY0ZCd29pSjYrTnoxRmc1Q2pkNE9XcGJUTWNvYWxHalJh YVlDa1dXUjFwTExJCkVUUnBoWlNzU1dDRWM0T2NGRDE3RWpsemM0MjFZWDJvcGJiT1duaW1TMktH QkFzV2tLSzZrYVRCSkMwNmhwYXdGU1E1dnNYT0wwdDMKTURNMkJ4WXJyNzdWL2YzOS92NysvLy8v OC9QelUzU2s4Zkh4QUFBQUN5Tkc3Ky92ZG5aMjZPam81K2ZuOWZYMTV1Ym1BUVFKK3ZyNgo5L2Yz K1BqNC9QejhQR0NZNnVycTdlM3Q3T3pzRHpCZ3NiM1BYVytMT0ZSL2haT29ycTZ1ZzQ2Z1FFQkFm cFc0ZnBhNU1sbVNlb2FaCkVERmlIMG1JdDdxK2NuNlJQejgvZkltY0tGR05kWUdVYjI5dkRpMWF1 cjdDRFNoUmlKL0FyTEMwTkZxVWVJV1lzTE80ZTRpYm1hYTYKYzRDVHNyVzZ0TGU4cjdLM2w1ZVhT VlZwdGJpOVQzQ2liWGFGcnJHMnViekFTbUtGZ0pXekN5RkJkNFNYcGJUTHJLK3pxNjZ5Y24rUwpx cTJ4VjE5cVNtR0ZUMmFLUEV4bFluK3NUR09IWUh1alRHU0h1NzdERGl0WHY4blhUVk5ldnI2K0tq NWVlSUtTUmxScGZJaWJlWWlkCk8xMlNSV2lkdWJtNWE0ZXhUbWFKVEdhTjE5Zlg0T2J1bVptWlQw OVBmSXFmN3ZIMEZoZ2JzTDdTb2JMTm41K2Z5ZEhlYUhhTGVINkgKUjFsenByYlBJVHRpR2pwcDcv TDNDd3dOY0hCd09scUxkWSsyZjRTTm5xdStjNEdXWUdCZ0hTNUdFUjgwNGVIaE16Zy9VM09ra1pH Ugp1OERIcGJYT1IxZHZoWk9xU0Z4NWFvV3NKemxVaUp5NjJkM2tVbkdlZVlTV21hYTVtcWU3THps SmZZK3NtcWU5aW9xS2tKKzI2dTN3CmVvZWFPMHBmM2VEbGw2Q3VVMmFDVzJxQzZ1enZVR3lXWkhD Q1pYV04zTnpja2FTL0hDby9UMXR1cnJDeVdtZDZMeTh2UkdXWG5LN0wKdUxxOFJWSmxncG04VGxW aW02dkVUbTJkd2N6ZXhzak1La0prVldSOFBWQnJXMmwvVm5HWnBiYlFXSGFpTjFGNXY4cmFlM3Q3 SGtXQQpkNCt5UWtSSElEaGJORnFUaDVtMWxLVzljSDJSajUyemNuaUJORXRzRFJNZFYzT2VKVEZE TGpaQ0dTSXdGVUdES2RZMzZnQUFBUUIwClVrNVQvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLwovLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCi8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vL0FGUDNCeVVBQUFiVVNVUkJWSGphM0ZobmRG UkZGSTRSU0NESgpFaVNVVUxMQ0xnWkNod3VJQ3lUVWJFS2tSRnl5SU1HdzBqdWhoTkFKdlhkRXBZ bUlDQW9pSWtVRjdMMzMzbnZ2L1hwbjVwV1oyY254ClYvemhkdzd2dG0vdW5mZWRlZTlsaWFuWldV Wk5KSXpxckdJVUdrZ0dsb2FvRlRKWVI0OGJlaHlTUjIvWldZZkhZeTVGYmFEaUVMT3kKazRKcmFl K3oxRlNuV1dnZ0dWZ0ttdHdTdFVJRzY3akxEWGRSdUpJNUNVclBEMGpZVGpyT25SUFQxQWxSRzZo UTFaWjNWSEdEQjRkcApxV0ZvSUJsWU11NHlySkRCTys2Mm85MHNXazdPTzlxeXJ4QTc2bGkwaUUv VEoyZ2JxRmpWUm5UUVVBV0hhWmxoYUNBWldESnVONnlRCklUbzJzYzRsRDBhUTk2Uys3QWZVTXgw V0xlTFRvaWI4cDZwbFoyZDNzekdaZ3V0eFBWMG5kM01SZ3dhU2dTWGpic01LUmJWc2pqSisKTG9Y UFZDTlQyVm0ybWFMbjBHMnhXYmh0dDVLL1hwMFF2UUVNYnlvckt3dUczVGdZTE9ST01Caml0cEJz WWRBR1lrZzRJWjB0U2hJMQpHSTZaMGF0WHJ5NDJwbEF3RnNmU2RVb1hGM2xvSUJsWU1rd3I5RHJo V1hyZjFYeE0rRE1vVGVZdFo5aytpcmFpMjJLZmNQMWJlVHRsClF0UUdDZzhETkcvVkN0SzMyTHA5 QXpDSTJSQkFPay9VZ2lxNEZHd2czbWQ1bjArajRrYUFwWXcwRFdBYkwwbFUyQmd6cEUrZlBzNnMK U2hRTXhzRjByYVRjbzRGa1lQM2JDcjIrbmY2ZDlYak9XdTRRU2x0R1FKNGd0eEMrTWtGSGFIL3Bx b01aOGZHQjJva0o0dkNnTHhhQQpLZmdaM1RaTGhRRVdZeitBMkh3T3hBRUFaSWtGZExyNkEvUWow aWFBVlJGZXdqTlVIQ2ZvYldPRzlPN2QyNzA5Q2tnMXVqNXdwUTErCmo5RWtBMHRSeGJCQ3J4L1Bv c3ZldlhUSk9rNFhKcGRsTE5Vb3FtUm9JWHhsZ2k1YWVteEtraTlFejJmUjc0KzNzSkt2QUx4QnBo WEoKMG9Ecyt3QkZUTFVINHptNE5HUXphZ05jWktzV09nbkZTU2hVaTFDeG9hQjdZNloyNzk1OWtJ MzdLUmlObzd2TFlBTU5KQU5MeGxRNQp0MHlzME92ZUMrelYzM25wTXBYU1pENjgwTVpURkMwenRC RCtWTU5VR3kyZ3BULzRKajJLQ2JEeFdObzBrZndJb0I0Wk9pNlFTTFllCnJFV21Xbjk3RVpPR1VB UncybEl0bkE3NTdhV1NRNCtaZUttR0czRzJFak9XZ1dSZ3lkRkVLeWR1azRMWmh2cUtveUk4bXNk cUU1VVcKRnBhcExTUmZtYUFkTlNqMmh1RGgyclhwY1N2dzFYaElaTDNqb0pROWM3RjBZdWhOWHdy cmpLclJtK3h0b1ZvNEFlQTFOS28yNFRJVgpkOWJIdWtxQ3NRd2tBMHVPSmxnNWppVVUxRFhWSXlk WWRDTENheE9VRmhhV3FDMGtYNW1nWWltOXNhckFYMFZGZjdPN2ZlYTBsYTdPClhtZ05vT0VhZ0Q4 d0NIQXpsK0dsYXdoYmhEVGtKVURhZ29oUXJSWTl5NmxobzJwanVpcW8yczZIZGNuZWVvVU54aktR REN5WElGYTQKcWxGUTExaFAzdE8xNjU1a3NYYU0wc0xDRXJXRjVDc1RWUFNETC9GaUtFRDBReXhp NDUrdDlDZnNoWllJYStqUU5TZjFZdjFjQm81VwpRaHFPT21lUXE1WUthY1VBWHhoVm01U2JtM3Zk VlRaZXovQWlEcWZVVFhrMkdNc2hyYzVsSGlNWldBTWRpQlhPWFRTallMaTUzbnIxCjZ0Yk1VamhK bUtwWDJ4aElVVE8xaGVRckUxUThUWDh0YkdCUFlWT29nK0hTVTFhNktBMFNDeUhOaXpYb2E1b0lE WVVNcTZvUi9oVFMKTUhjQndCYXVHa0JjYTREM2pLcE43OXUzN3dybjVwa2NPSnhTTTVWdE9LU1VG OGxyNHpHejRoMklGVTVoSmdYRHpYVmZTa3Nmc3hSTwpGK1pWNXcrd1g2VUpWZ3ZKVnlhbytKNWUr MDlBaTJCWkt2d1NybFVuWXVkSnJhVndIbkV4d0NVQWE0UU12eFVRdkVJYTVwWVVzOWNlClUyMUJ4 RWYrTkpOcUkzTnljclNoNHluVjVuSVg5NkJEOHJVakwrY25tN1d3M0QrWTJBcW5RUnNLeGtmWFJV Yy9OeFNPZEkyN0QzdkMKUXFtRjhKVUpZcHMyL0dzaFdFUm5CdDZsUDdBMnBEajVVK3l4VzhjUFhT cU04Nkx4YTRBdkFCeGlxcTB0UWJ4REhMWW8xZVprWm1acQpkend2VThVUmRFbmVveXp6cmNVcVg3 WGJ0QjZaSDZ0MWZTeUZjMXpqN3NOUmpmeDVpaDgxNFlqYjdkaTRrNkdTbmRVT0ptVlUyL215Cnow blhaNDhkZlFQd1BOa2FhRll0V0Fwd2dLbjJLZE5mSExZbzFlWm1aV1ZwZHp3MFM4VlFsRWlScjFt cXFXQTFLbGUxZXl1clBUYXYKVU92NldBcm51c2JkaHoyaEVkK0g3T3NUbkRKLzdtUGg4S0VEUGd4 dHE3WGYvU25xeXdmK0RjQjF3SDRZb1BzMVlLb01jUHpxUHZ1MwpBVHRzUHhwVW05K2pSdzlkdFI0 cWhxSk1LdGxCUVdQQktsODFmN3NkVW9mdGo2Um9kWDBzaGZOZDQrN0RVWTN2US9iVkNWS1pqOCtJ CmU1UUxjSEpEbkh2VzJNK0Q1KzFEVjFTZWFyRnh5YzR2S3ZUbnN4OVlVYXJGQndJQjdZNjZCRlIw UVlYVW5xYzRLNi84LzB6eHRwYzYKOUV6MmFXVjlMSVh4cm5IM1lVL0lFME5sWDVrZ2xhMW5JaU5B SDhTZFBkdEhwR1JTSUpETUQ1MDl2Y1JaTGJiRWtNRldGQVFDSmZaRwpDOWpGcGhkdzFmRC9DL29n K2l1bTh6OENEQURib3JEd2hGdXh1Z0FBQUFCSlJVNUVya0pnZ2c9PQoK