144361 2015-04-28 16:30:04 -0700 Increase stablility of run-benchmark script 2015-04-28 17:52:54 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dewei_zhu webkit-unassigned commit-queue dewei_zhu glenn rniwa oldest_to_newest 1089785 0 dewei_zhu 2015-04-28 16:30:04 -0700 Increase stablility of run-benchmark script 1089789 1 251895 dewei_zhu 2015-04-28 16:39:41 -0700 Created attachment 251895 Patch 1089790 2 commit-queue 2015-04-28 16:42:11 -0700 Attachment 251895 did not pass style-queue: ERROR: Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:83: [SimpleHTTPServerDriver.killServer] Instance of 'Popen' has no 'terminate' member [pylint/E1101] [5] Total errors found: 1 in 13 files If any of these errors are false positives, please file a bug against check-webkit-style. 1089794 3 251895 commit-queue 2015-04-28 16:53:09 -0700 Comment on attachment 251895 Patch Rejecting attachment 251895 from commit-queue. dewei_zhu@apple.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 1089805 4 251895 commit-queue 2015-04-28 17:52:50 -0700 Comment on attachment 251895 Patch Clearing flags on attachment: 251895 Committed r183520: <http://trac.webkit.org/changeset/183520> 1089806 5 commit-queue 2015-04-28 17:52:54 -0700 All reviewed patches have been landed. Closing bug. 251895 2015-04-28 16:39:41 -0700 2015-04-28 17:52:50 -0700 Patch bug-144361-20150428163833.patch text/plain 22511 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNTEzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTYwNjk5YjJlY2YzNjc3OWY4YTU4OTljNGMwYTQzZTgx YWRlZTk2NS4uZGYwNzcxZjMzYmQ1Nzk5YjZjODkwNWFlMjg4NDU4NGYzYjg0ZTkzYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5 IEBACisyMDE1LTA0LTI4ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgIEluY3JlYXNlIHN0YWJsaWxpdHkgb2YgcnVuLWJlbmNobWFyayBzY3JpcHQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDM2MQorCisgICAgICAg IFJldmlld2VkIGJ5IFJ5b3N1a2UgTml3YS4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWJlbmNo bWFyazoKKyAgICAgICAgKG1haW4pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2ht YXJrX3J1bm5lci9SRUFETUUubWQ6IFVwZGF0ZSByZWFkbWUgZHVlIHRvIGNoYW5nZXMuCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19idWlsZGVy L2dlbmVyaWNfYmVuY2htYXJrX2J1aWxkZXIucHk6CisgICAgICAgIChHZW5lcmljQmVuY2htYXJr QnVpbGRlci5jbGVhbik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVu bmVyL2JlbmNobWFya19ydW5uZXIucHk6IEltcHJvdmUgZXJyb3IgaGFuZGxpbmcgYW5kIHJlbW92 ZSBhbiB1bm5lY2Vzc2FyeSBsb29wLgorICAgICAgICAoQmVuY2htYXJrUnVubmVyLl9faW5pdF9f KToKKyAgICAgICAgKEJlbmNobWFya1J1bm5lci5leGVjdXRlKToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X3NhZmFyaV9kcml2 ZXIucHk6CisgICAgICAgIChPU1hTYWZhcmlEcml2ZXIucHJlcGFyZUVudik6IFJlbW92ZSBzYXZl ZCBzZXNzaW9ucyBvZiBTYWZhcmkuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1h cmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9KZXRTdHJlYW0ucGF0Y2g6IFVwbG9hZCAncmVzdWx0cycg cmF0aGVyIHRoYW4gJ3RpbWUnLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJr X3J1bm5lci9kYXRhL3BsYW5zL2pldHN0cmVhbS5wbGFuOiBVcGRhdGUgZm9ybWF0ZS4KKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wbGFucy9zcGVlZG9t ZXRlci5wbGFuOiBVcGRhdGUgZm9ybWF0ZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Jl bmNobWFya19ydW5uZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyL2h0dHBfc2VydmVyL3R3aXN0ZWRfaHR0 cF9zZXJ2ZXIucHk6IAorICAgICAgICAoU2VydmVyQ29udHJvbC5yZW5kZXJfUE9TVCk6IEZsdXNo IHRoZSBidWZmZXIgdG8gbWFrZSBzdXJlIHdlIGNhbiBwYXNzIHRoZSByZXN1bHQgdG8gc3Rkb3V0 LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9odHRwX3NlcnZl cl9kcml2ZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyLnB5OgorICAgICAgICAoSFRUUFNlcnZlckRyaXZl ci5mZXRjaFJlc3VsdCk6CisgICAgICAgIChIVFRQU2VydmVyRHJpdmVyKToKKyAgICAgICAgKEhU VFBTZXJ2ZXJEcml2ZXIua2lsbFNlcnZlcik6IEFkZCBraWxsIHNlcnZlciBpbnRlcmZhY2UuCisg ICAgICAgIChIVFRQU2VydmVyRHJpdmVyLmdldFJldHVybkNvZGUpOiBBZGQgZ2V0IHJldHVybiBj b2RlIGludGVyZmFjZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5u ZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyL3NpbXBsZV9odHRwX3NlcnZlcl9kcml2ZXIucHk6IEFkanVz dCB0byBzdXBwb3J0IG5ldyBpbnRlcmZhY2VzLgorICAgICAgICAoU2ltcGxlSFRUUFNlcnZlckRy aXZlci5zZXJ2ZSk6CisgICAgICAgIChTaW1wbGVIVFRQU2VydmVyRHJpdmVyLmZldGNoUmVzdWx0 KToKKyAgICAgICAgKFNpbXBsZUhUVFBTZXJ2ZXJEcml2ZXIpOgorICAgICAgICAoU2ltcGxlSFRU UFNlcnZlckRyaXZlci5raWxsU2VydmVyKToKKyAgICAgICAgKFNpbXBsZUhUVFBTZXJ2ZXJEcml2 ZXIuZ2V0UmV0dXJuQ29kZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtf cnVubmVyL3V0aWxzLnB5OgorICAgICAgICAoZm9yY2VSZW1vdmUpOiBQcm92aWRlIHB5dGhvbiB2 ZXJzaW9uIG9mICdybSAtcmYnLgorCiAyMDE1LTA0LTI4ICBHeXV5b3VuZyBLaW0gIDxneXV5b3Vu Zy5raW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBbQ01ha2VdIFJlbW92ZSB1bm5lY2Vzc2FyeSBp bmNsdWRlIHBhdGhzIGluIFRlc3RXZWJLaXRBUEkgY21ha2UgZmlsZXMKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvcnVuLWJlbmNobWFyayBiL1Rvb2xzL1NjcmlwdHMvcnVuLWJlbmNobWFyawpp bmRleCA1YTU3NTM3OWQ4NzY2YTFhMDIyNWRmN2FmMTM2ZWU0Yzk3ZTVhMTQxLi4zYjA2MjlhYTEy ODllMzA2ZjdlMGFlM2ZlMjY2ZjJiNjdkNmI2MDcyIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRz L3J1bi1iZW5jaG1hcmsKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tYmVuY2htYXJrCkBAIC0zMSw3 ICszMSw3IEBAIGRlZiBtYWluKCk6CiAgICAgX2xvZy5kZWJ1ZygnXHRidWlsZCBkaXJlY3Rvcnlc dDogJXMnICUgYXJncy5idWlsZERpcikKICAgICBfbG9nLmRlYnVnKCdcdHBsYW4gbmFtZVx0OiAl cycsIGFyZ3MucGxhbikKICAgICBydW5uZXIgPSBCZW5jaG1hcmtSdW5uZXIoYXJncy5wbGFuLCBh cmdzLmJ1aWxkRGlyLCBhcmdzLm91dHB1dCwgYXJncy5wbGF0Zm9ybSwgYXJncy5icm93c2VyKQot ICAgIHJ1bm5lci5leGVjdXRlKCkKKyAgICByZXR1cm4gcnVubmVyLmV4ZWN1dGUoKQogCiBpZiBf X25hbWVfXyA9PSAnX19tYWluX18nOgogICAgIG1haW4oKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL1JFQURNRS5tZCBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9SRUFETUUubWQKaW5kZXggNTIzNTBkZmRlZjgxNmFm OGQ1MjQyNTg4NDUwZTkzZTAwZTcwNTAzYy4uMGNhZDRhMTk4ZTNlMDcxNjAzNGMzZTg2NWRkYTQx ZWJhMDk4MDA0NyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtf cnVubmVyL1JFQURNRS5tZAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19y dW5uZXIvUkVBRE1FLm1kCkBAIC00NSw3ICs0NSw3IEBAIGJlbmNobWFya19ydW5uZXIKICMjIEhP VyBUT3MKICMjIyBIb3cgdG8gcnVuCiBgYGBzaGVsbAotICAgIHB5dGhvbiBwYXRoL3RvL3J1bl9i ZW5jaG1hcmsgLS1idWlsZC1kaXJlY3RvcnkgcGF0aC90by9icm93c2VyL2RpcmVjdG9yeSAtLXBs YW4ganNvbl9mb3JtYXRfcGxhbiAtLXBsYXRmb3JtIHRhcmdldF9wbGF0Zm9ybSAtLWJyb3dzZXIg dGFyZ2V0X2Jyb3dzZXIKKyAgICBweXRob24gcGF0aC90by9ydW4tYmVuY2htYXJrIC0tYnVpbGQt ZGlyZWN0b3J5IHBhdGgvdG8vYnJvd3Nlci9kaXJlY3RvcnkgLS1wbGFuIGpzb25fZm9ybWF0X3Bs YW4gLS1wbGF0Zm9ybSB0YXJnZXRfcGxhdGZvcm0gLS1icm93c2VyIHRhcmdldF9icm93c2VyCiBg YGAKICogKipwYXRoL3RvL2Jyb3dzZXIvZGlyZWN0b3J5Kio6IHNob3VsZCBiZSB0aGUgZm9sZGVy IGNvbnRhaW5pbmcgdGhlIGV4ZWN1dGFibGUgYmluYXJ5KGUuZy4gL0FwcGxpY2F0aW9uLyBvbiBP U1ggd2hpY2ggY29udGFpbnMgU2FmYXJpLmFwcCkKICogKipqc29uX2Zvcm1hdF9wbGFuKio6IHRo ZSBiZW5jaG1hcmsgcGxhbiB5b3Ugd2FudCB0byBleGVjdXRlICAKQEAgLTU1LDI5ICs1NSwyNCBA QCBUbyBjcmVhdGUgYSBwbGFuLCB5b3UgbWF5IHJlZmVyIHRvIFBsYW5zL2pldHN0cmVhbS5wbGFu LgogYGBganNvbiAKIHsKICAgICAiaHR0cF9zZXJ2ZXJfZHJpdmVyIjogIlNpbXBsZUhUVFBTZXJ2 ZXJEcml2ZXIiLCAKLSAgICAiYmVuY2htYXJrcyI6IFsKLSAgICAgICAgewotICAgICAgICAgICAg InRpbWVvdXQiIDogNjAwLAotICAgICAgICAgICAgImNvdW50IjogNSwKLSAgICAgICAgICAgICJi ZW5jaG1hcmtfYnVpbGRlciI6ICJKZXRTdHJlYW1CZW5jaG1hcmtCdWlsZGVyIiwKLSAgICAgICAg ICAgICJvcmlnaW5hbF9iZW5jaG1hcmsiOiAiLi4vLi4vLi4vLi4vUGVyZm9ybWFuY2VUZXN0cy9K ZXRTdHJlYW0iLAotICAgICAgICAgICAgImJlbmNobWFya19wYXRjaCI6ICJkYXRhL3BhdGNoZXMv SmV0U3RyZWFtLnBhdGNoIiwKLSAgICAgICAgICAgICJlbnRyeV9wb2ludCI6ICJKZXRTdHJlYW0v SmV0U3RyZWFtLTEuMC4xL2luZGV4Lmh0bWwiLAotICAgICAgICAgICAgIm91dHB1dF9maWxlIjog ImpldHN0cmVhbS5yZXN1bHQiCi0gICAgICAgIH0KLSAgICBdCisgICAgInRpbWVvdXQiIDogNjAw LAorICAgICJjb3VudCI6IDUsCisgICAgImJlbmNobWFya19idWlsZGVyIjogIkpldFN0cmVhbUJl bmNobWFya0J1aWxkZXIiLAorICAgICJvcmlnaW5hbF9iZW5jaG1hcmsiOiAiLi4vLi4vLi4vLi4v UGVyZm9ybWFuY2VUZXN0cy9KZXRTdHJlYW0iLAorICAgICJiZW5jaG1hcmtfcGF0Y2giOiAiZGF0 YS9wYXRjaGVzL0pldFN0cmVhbS5wYXRjaCIsCisgICAgImVudHJ5X3BvaW50IjogIkpldFN0cmVh bS9KZXRTdHJlYW0tMS4wLjEvaW5kZXguaHRtbCIsCisgICAgIm91dHB1dF9maWxlIjogImpldHN0 cmVhbS5yZXN1bHQiCiB9CiBgYGAKIFBsYW4gaXMgYSBqc29uLWZvcm1hdHRlZCBkaWN0aW9uYXJ5 IHdoaWNoIGNvbnRhaW5zIGZvbGxvd2luZyBrZXlzIAogKiAqKmh0dHBfc2VydmVyX2RyaXZlcioq OiAoKipjYXNlLXNlbnNpdGl2ZSoqKSB0aGUgaHR0cCBzZXJ2ZXIgbW9kdWxlIHlvdSB3YW50IHRv IGhvc3QgdGhlIHJlc291cmNlcy4gQ3VycmVudCBhdmFpbGFibGUgb3B0aW9uIGlzICJTaW1wbGVI VFRQU2VydmVySGFuZGxlIiB3aGljaCBpcyBiYXNlZCBvbiBweXRob24gdHdpc3RlZCBmcmFtZXdv cmsuCi0qICoqYmVuY2htYXJrcyoqOiBjb250YWlucyBhIGxpc3Qgb2YgYmVuY2htYXJrcyB5b3Ug d2FudCB0byBydW4sIGVhY2ggYmVuY2htYXJrIGlzIGEgbGlzdCBjb250YWlucyBmb2xsb3dpbmcg a2V5czoKLSAgICAqICoqdGltZW91dCoqOiB0aW1lIGxpbWl0IGZvciAqKkVBQ0ggUlVOKiogb2Yg dGhlIGJlbmNobWFyay4gVGhpcyBjYW4gYXZvaWQgcHJvZ3JhbSBnZXR0aW5nIHN0dWNrIGluIHRo ZSBleHRyZW1lIGNpcmN1bXN0YW5jZXMuIFRoZSB0aW1lIGxpbWl0IGlzIHN1Z2dlc3RlZCB0byBi ZSAxLjUtMnggdGhlIHRpbWUgc3BlbnQgaW4gYSBub3JtYWwgcnVuLgotICAgICogKipjb3VudCoq OiB0aGUgbnVtYmVyIG9mIHRpbWVzIHlvdSB3YW50IHRvIHJ1biBiZW5jaG1hcmsKLSAgICAqICoq YmVuY2htYXJrX2J1aWxkZXIqKjogIGJ1aWxkZXIgb2YgdGhlIGJlbmNobWFyayB3aGljaCBpcyBy ZXNwb25zaWJsZSBmb3IgYXJyYW5naW5nIGJlbmNobWFyayBiZWZvcmUgdGhlIHdlYiBzZXJ2ZXIg c2VydmluZyB0aGUgZGlyZWN0b3J5LiBJbiBtb3N0IGNhc2UsICdHZW5lcmljQmVuY2htYXJrSGFu ZGxlcicgaXMgc3VmZmljaWVudC4gSXQgY29waWVzIHRoZSBiZW5jaG1hcmsgdG8gYSB0ZW1wb3Jh cnkgZGlyZWN0b3J5IGFuZCBhcHBsaWVzIHBhdGNoIHRvIGJlbmNobWFyay4gSWYgeW91IGhhdmUg c3BlY2lhbCByZXF1aXJlbWVudCwgeW91IGNvdWxkIGRlc2lnbiB5b3VyIG93biBiZW5jaG1hcmsg aGFuZGxlLCBqdXN0IGxpa2UgdGhlICdKZXRTdHJlYW1CZW5jaG1hcmtIYW5kbGUnIGluIHRoaXMg ZXhhbXBsZS4KLSAgICAqICoqb3JpZ2luYWxfYmVuY2htYXJrKio6IHBhdGggb2YgYmVuY2htYXJr LCBhIHJlbGF0aXZlIHBhdGggdG8gdGhlIHJvb3Qgb2YgdGhpcyBwcm9qZWN0ICgnYmVuY2htYXJr X3J1bm5lcicgZGlyZWN0b3J5KQotICAgICogKipiZW5jaG1hcmtfcGF0aCoqOiAoKipPUFRJT05B TCoqKSBwYXRoIG9mIHBhdGNoLCBhIHJlbGF0aXZlIHBhdGggdG8gdGhlIHJvb3Qgb2YgdGhpcyBw cm9qZWN0ICgnYmVuY2htYXJrX3J1bm5lcicgZGlyZWN0b3J5KQotICAgICogKiplbnRyeV9wb2lu dCoqOiB0aGUgcmVsYXRpdmUgdXJsIHlvdSB3YW50IGJyb3dzZXIgdG8gbGF1bmNoIChhIHJlbGF0 aXZlIHBhdGggdG8gdGhlIHdlYnJvb3QpCi0gICAgKiAqKm91dHB1dF9maWxlKio6IHNwZWNpZnkg dGhlIG91dHB1dCBmaWxlCisqICoqdGltZW91dCoqOiB0aW1lIGxpbWl0IGZvciAqKkVBQ0ggUlVO Kiogb2YgdGhlIGJlbmNobWFyay4gVGhpcyBjYW4gYXZvaWQgcHJvZ3JhbSBnZXR0aW5nIHN0dWNr IGluIHRoZSBleHRyZW1lIGNpcmN1bXN0YW5jZXMuIFRoZSB0aW1lIGxpbWl0IGlzIHN1Z2dlc3Rl ZCB0byBiZSAxLjUtMnggdGhlIHRpbWUgc3BlbnQgaW4gYSBub3JtYWwgcnVuLgorKiAqKmNvdW50 Kio6IHRoZSBudW1iZXIgb2YgdGltZXMgeW91IHdhbnQgdG8gcnVuIGJlbmNobWFyaworKiAqKmJl bmNobWFya19idWlsZGVyKio6ICBidWlsZGVyIG9mIHRoZSBiZW5jaG1hcmsgd2hpY2ggaXMgcmVz cG9uc2libGUgZm9yIGFycmFuZ2luZyBiZW5jaG1hcmsgYmVmb3JlIHRoZSB3ZWIgc2VydmVyIHNl cnZpbmcgdGhlIGRpcmVjdG9yeS4gSW4gbW9zdCBjYXNlLCAnR2VuZXJpY0JlbmNobWFya0hhbmRs ZXInIGlzIHN1ZmZpY2llbnQuIEl0IGNvcGllcyB0aGUgYmVuY2htYXJrIHRvIGEgdGVtcG9yYXJ5 IGRpcmVjdG9yeSBhbmQgYXBwbGllcyBwYXRjaCB0byBiZW5jaG1hcmsuIElmIHlvdSBoYXZlIHNw ZWNpYWwgcmVxdWlyZW1lbnQsIHlvdSBjb3VsZCBkZXNpZ24geW91ciBvd24gYmVuY2htYXJrIGhh bmRsZSwganVzdCBsaWtlIHRoZSAnSmV0U3RyZWFtQmVuY2htYXJrSGFuZGxlJyBpbiB0aGlzIGV4 YW1wbGUuCisqICoqb3JpZ2luYWxfYmVuY2htYXJrKio6IHBhdGggb2YgYmVuY2htYXJrLCBhIHJl bGF0aXZlIHBhdGggdG8gdGhlIHJvb3Qgb2YgdGhpcyBwcm9qZWN0ICgnYmVuY2htYXJrX3J1bm5l cicgZGlyZWN0b3J5KQorKiAqKmJlbmNobWFya19wYXRoKio6ICgqKk9QVElPTkFMKiopIHBhdGgg b2YgcGF0Y2gsIGEgcmVsYXRpdmUgcGF0aCB0byB0aGUgcm9vdCBvZiB0aGlzIHByb2plY3QgKCdi ZW5jaG1hcmtfcnVubmVyJyBkaXJlY3RvcnkpCisqICoqZW50cnlfcG9pbnQqKjogdGhlIHJlbGF0 aXZlIHVybCB5b3Ugd2FudCBicm93c2VyIHRvIGxhdW5jaCAoYSByZWxhdGl2ZSBwYXRoIHRvIHRo ZSB3ZWJSb290KQorKiAqKm91dHB1dF9maWxlKio6IHNwZWNpZnkgdGhlIG91dHB1dCBmaWxlLCB0 aGlzIGNhbiBiZSBvdmVyd3JpdHRlbiBieSBzcGVjaWZ5aW5nICctLW91dHB1dC1maWxlJyB3aGls ZSBpbnZva2luZyBydW4tYmVuY2htYXJrIHNjcmlwdAogCiAjIyMgSG93IHRvIGltcG9ydCBhIGJl bmNobWFyawogKiBNb2RpZnkgdGhlIGJlbmNobWFyayBodG1sIGZpbGUsIG1ha2Ugc3VyZSB0aGUg cGFnZSBoYXMgZm9sbG93aW5nIGZ1bmN0aW9uYWxpdGllczoKQEAgLTEwNyw1ICsxMDIsNCBAQCBQ bGFuIGlzIGEganNvbi1mb3JtYXR0ZWQgZGljdGlvbmFyeSB3aGljaCBjb250YWlucyBmb2xsb3dp bmcga2V5cwogKiBEbyBmb2xsb3dpbmcgaW5zdHJ1Y3Rpb24gKipPTkxZIElGIE5FRURFRCoqLiBJ biBtb3N0IGNhc2UsIHlvdSBkbyBub3QgaGF2ZSB0by4KICAgICAqIElmIHlvdSB3YW50IHRvIGN1 c3RvbWl6ZSBCcm93c2VyRHJpdmVyIGZvciBzcGVjaWZpYyBicm93c2VyL3BsYXRmb3JtLCB5b3Ug bmVlZCB0byBleHRlbmQgYnJvd3Nlcl9kcml2ZXIvYnJvd3Nlcl9kcml2ZXIucHkgYW5kIHJlZ2lz dGVyIHlvdXIgbW9kdWxlIGluIGJyb3dzZXJfZHJpdmVyL2Jyb3dzZXJfZHJpdmVyc2pzb24uCiAg ICAgKiBJZiB5b3Ugd2FudCB0byBjdXN0b21pemUgSFRUUFNlcnZlckRyaXZlciwgeW91IG5lZWQg dG8gZXh0ZW5kIGh0dHBfc2VydmVyX2RyaXJ2ZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyIGFuZCByZWdp c3RlciB5b3VyIG1vZHVsZSBpbiBodHRwX3NlcnZlcl9kcml2ZXIvaHR0cF9zZXJ2ZXJfZHJpdmVy cy5qc29uLgotICAgICogSWYgeW91IHdhbnQgdG8gY3VzdG9taXplIFJlc3VsdFdyYXBwZXIsIHlv dSBuZWVkIHRvIGV4dGVuZCByZXN1bHRfd3JhcHBlci9iYXNlX3Jlc3VsdF93cmFwcGVyLnB5IGFu ZCByZWdpc3RlciB5b3VyIG1vZHVsZSBpbiByZXN1bHRfd3JhcHBlci9yZXN1bHRfd3JhcHBlcnMu anNvbiAKICAgICAqIElmIHlvdSB3YW50IHRvIGN1c3RvbWl6ZSBCZW5jaG1hcmtCdWlsZGVyLCB5 b3UgbmVlZCB0byBleHRlbmQgYmVuY2htYXJrX2J1aWxkZXIvZ2VuZXJpY19iZW5jaG1hcmtfYnVp bGRlciByZWdpc3RlciB5b3UgbW9kdWxlIGluIGJlbmNobWFya19idWlsZGVyL2JlbmNobWFya19i dWlsZGVycy5qc29uCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFy a19ydW5uZXIvYmVuY2htYXJrX2J1aWxkZXIvZ2VuZXJpY19iZW5jaG1hcmtfYnVpbGRlci5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfYnVpbGRl ci9nZW5lcmljX2JlbmNobWFya19idWlsZGVyLnB5CmluZGV4IGJlNTQ4Nzk5OWVjYTk2MzVhMWJl MDhkMTE2ZjIzOGFmNmI4NmY5NzkuLjZhYzI2ZjM0YWFkZDNiZjYwNjg1MDhmMzc4M2FmNTc1MDY5 MmJmNTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5l ci9iZW5jaG1hcmtfYnVpbGRlci9nZW5lcmljX2JlbmNobWFya19idWlsZGVyLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfYnVpbGRlci9n ZW5lcmljX2JlbmNobWFya19idWlsZGVyLnB5CkBAIC02LDcgKzYsNyBAQCBpbXBvcnQgb3MKIGlt cG9ydCBzaHV0aWwKIGltcG9ydCBzdWJwcm9jZXNzCiAKLWZyb20gd2Via2l0cHkuYmVuY2htYXJr X3J1bm5lci51dGlscyBpbXBvcnQgZ2V0UGF0aEZyb21Qcm9qZWN0Um9vdAorZnJvbSB3ZWJraXRw eS5iZW5jaG1hcmtfcnVubmVyLnV0aWxzIGltcG9ydCBnZXRQYXRoRnJvbVByb2plY3RSb290LCBm b3JjZVJlbW92ZQogCiAKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKQEAgLTQw LDQgKzQwLDQgQEAgY2xhc3MgR2VuZXJpY0JlbmNobWFya0J1aWxkZXIob2JqZWN0KToKICAgICBk ZWYgY2xlYW4oc2VsZik6CiAgICAgICAgIF9sb2cuaW5mbygnQ2xlYW5uaW5nIEJlbmNobWFyaycp CiAgICAgICAgIGlmIHNlbGYud2ViUm9vdDoKLSAgICAgICAgICAgIHNodXRpbC5ybXRyZWUoc2Vs Zi53ZWJSb290KQorICAgICAgICAgICAgZm9yY2VSZW1vdmUoc2VsZi53ZWJSb290KQpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19y dW5uZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2ht YXJrX3J1bm5lci5weQppbmRleCBiNGI5ZDE5YWYwYWIwMTJiZWFjMDI2N2Q1NTVkZmNjZjIzOWNk YzQ3Li5hOTcyOGEzNzg1OGExZDA0NGMwMDE5ZTJmODg2NTdhNzZkZjM5YzEyIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5l ci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2ht YXJrX3J1bm5lci5weQpAQCAtMzAsNDMgKzMwLDQ1IEBAIGNsYXNzIEJlbmNobWFya1J1bm5lcihv YmplY3QpOgogICAgICAgICAgICAgICAgIHNlbGYucGxhbiA9IGpzb24ubG9hZChmcCkKICAgICAg ICAgICAgICAgICBzZWxmLmJyb3dzZXJEcml2ZXIgPSBCcm93c2VyRHJpdmVyRmFjdG9yeS5jcmVh dGUoW3BsYXRmb3JtLCBicm93c2VyXSkKICAgICAgICAgICAgICAgICBzZWxmLmh0dHBTZXJ2ZXJE cml2ZXIgPSBIVFRQU2VydmVyRHJpdmVyRmFjdG9yeS5jcmVhdGUoW3NlbGYucGxhblsnaHR0cF9z ZXJ2ZXJfZHJpdmVyJ11dKQotICAgICAgICAgICAgICAgIHNlbGYuYmVuY2htYXJrcyA9IHNlbGYu cGxhblsnYmVuY2htYXJrcyddCiAgICAgICAgICAgICAgICAgc2VsZi5idWlsZERpciA9IG9zLnBh dGguYWJzcGF0aChidWlsZERpcikKICAgICAgICAgICAgICAgICBzZWxmLm91dHB1dEZpbGUgPSBv dXRwdXRGaWxlCiAgICAgICAgIGV4Y2VwdCBJT0Vycm9yOgogICAgICAgICAgICAgX2xvZy5lcnJv cignQ2FuIG5vdCBvcGVuIHBsYW4gZmlsZTogJXMnICUgcGxhbkZpbGUpCiAgICAgICAgIGV4Y2Vw dCBWYWx1ZUVycm9yOgotICAgICAgICAgICAgX2xvZy5lcnJvcignUGxhbiBmaWxlOiVzIG1heSBu b3QgZm9sbG93IGpzb24gZm9ybWF0JyAlIHBsYW5GaWxlKQorICAgICAgICAgICAgX2xvZy5lcnJv cignUGxhbiBmaWxlOiVzIG1heSBub3QgZm9sbG93IEpTT04gZm9ybWF0JyAlIHBsYW5GaWxlKQog ICAgICAgICBleGNlcHQ6CiAgICAgICAgICAgICByYWlzZQogCiAgICAgZGVmIGV4ZWN1dGUoc2Vs Zik6CiAgICAgICAgIF9sb2cuaW5mbygnU3RhcnQgdG8gZXhlY3V0ZSB0aGUgcGxhbicpCi0gICAg ICAgIGZvciBiZW5jaG1hcmsgaW4gc2VsZi5iZW5jaG1hcmtzOgotICAgICAgICAgICAgX2xvZy5p bmZvKCdTdGFydCBhIG5ldyBiZW5jaG1hcmsnKQotICAgICAgICAgICAgcmVzdWx0cyA9IFtdCi0g ICAgICAgICAgICBiZW5jaG1hcmtCdWlsZGVyID0gQmVuY2htYXJrQnVpbGRlckZhY3RvcnkuY3Jl YXRlKFtiZW5jaG1hcmtbJ2JlbmNobWFya19idWlsZGVyJ11dKQotICAgICAgICAgICAgd2ViUm9v dCA9IGJlbmNobWFya0J1aWxkZXIucHJlcGFyZShiZW5jaG1hcmtbJ29yaWdpbmFsX2JlbmNobWFy ayddLCBiZW5jaG1hcmtbJ2JlbmNobWFya19wYXRjaCddIGlmICdiZW5jaG1hcmtfcGF0Y2gnIGlu IGJlbmNobWFyayBlbHNlIE5vbmUpCi0gICAgICAgICAgICBmb3IgeCBpbiB4cmFuZ2UoaW50KGJl bmNobWFya1snY291bnQnXSkpOgotICAgICAgICAgICAgICAgIF9sb2cuaW5mbygnU3RhcnQgdGhl IGl0ZXJhdGlvbiAlZCBvZiBjdXJyZW50IGJlbmNobWFyaycgJSAoeCArIDEpKQotICAgICAgICAg ICAgICAgIHNlbGYuaHR0cFNlcnZlckRyaXZlci5zZXJ2ZSh3ZWJSb290KQotICAgICAgICAgICAg ICAgIHNlbGYuYnJvd3NlckRyaXZlci5wcmVwYXJlRW52KCkKLSAgICAgICAgICAgICAgICBzZWxm LmJyb3dzZXJEcml2ZXIubGF1bmNoVXJsKHVybHBhcnNlLnVybGpvaW4oc2VsZi5odHRwU2VydmVy RHJpdmVyLmJhc2VVcmwoKSwgYmVuY2htYXJrWydlbnRyeV9wb2ludCddKSwgc2VsZi5idWlsZERp cikKLSAgICAgICAgICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgICAgIHdpdGggdGltZW91 dChiZW5jaG1hcmtbJ3RpbWVvdXQnXSk6Ci0gICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQg PSBqc29uLmxvYWRzKHNlbGYuaHR0cFNlcnZlckRyaXZlci5mZXRjaFJlc3VsdCgpKQotICAgICAg ICAgICAgICAgICAgICAgICAgYXNzZXJ0KHJlc3VsdCkKLSAgICAgICAgICAgICAgICAgICAgICAg IHJlc3VsdHMuYXBwZW5kKHJlc3VsdCkKLSAgICAgICAgICAgICAgICBleGNlcHQ6Ci0gICAgICAg ICAgICAgICAgICAgIF9sb2cuZXJyb3IoJ05vIHJlc3VsdC4gU29tZXRoaW5nIHdlbnQgd3Jvbmcu IFdpbGwgc2tpcCBjdXJyZW50IGJlbmNobWFyay4nKQotICAgICAgICAgICAgICAgICAgICBzZWxm LmJyb3dzZXJEcml2ZXIuY2xvc2VCcm93c2VycygpCi0gICAgICAgICAgICAgICAgICAgIGJyZWFr Ci0gICAgICAgICAgICAgICAgZmluYWxseToKLSAgICAgICAgICAgICAgICAgICAgc2VsZi5icm93 c2VyRHJpdmVyLmNsb3NlQnJvd3NlcnMoKQotICAgICAgICAgICAgICAgICAgICBfbG9nLmluZm8o J0VuZCBvZiAlZCBpdGVyYXRpb24gb2YgY3VycmVudCBiZW5jaG1hcmsnICUgKHggKyAxKSkKLSAg ICAgICAgICAgIHJlc3VsdHMgPSBzZWxmLndyYXAocmVzdWx0cykKLSAgICAgICAgICAgIHNlbGYu ZHVtcChyZXN1bHRzLCBzZWxmLm91dHB1dEZpbGUgaWYgc2VsZi5vdXRwdXRGaWxlIGVsc2UgYmVu Y2htYXJrWydvdXRwdXRfZmlsZSddKQotICAgICAgICAgICAgYmVuY2htYXJrQnVpbGRlci5jbGVh bigpCisgICAgICAgIF9sb2cuaW5mbygnU3RhcnQgYSBuZXcgYmVuY2htYXJrJykKKyAgICAgICAg cmVzdWx0cyA9IFtdCisgICAgICAgIGJlbmNobWFya0J1aWxkZXIgPSBCZW5jaG1hcmtCdWlsZGVy RmFjdG9yeS5jcmVhdGUoW3NlbGYucGxhblsnYmVuY2htYXJrX2J1aWxkZXInXV0pCisgICAgICAg IHdlYlJvb3QgPSBiZW5jaG1hcmtCdWlsZGVyLnByZXBhcmUoc2VsZi5wbGFuWydvcmlnaW5hbF9i ZW5jaG1hcmsnXSwgc2VsZi5wbGFuWydiZW5jaG1hcmtfcGF0Y2gnXSBpZiAnYmVuY2htYXJrX3Bh dGNoJyBpbiBzZWxmLnBsYW4gZWxzZSBOb25lKQorICAgICAgICBmb3IgeCBpbiB4cmFuZ2UoaW50 KHNlbGYucGxhblsnY291bnQnXSkpOgorICAgICAgICAgICAgX2xvZy5pbmZvKCdTdGFydCB0aGUg aXRlcmF0aW9uICVkIG9mIGN1cnJlbnQgYmVuY2htYXJrJyAlICh4ICsgMSkpCisgICAgICAgICAg ICBzZWxmLmh0dHBTZXJ2ZXJEcml2ZXIuc2VydmUod2ViUm9vdCkKKyAgICAgICAgICAgIHNlbGYu YnJvd3NlckRyaXZlci5wcmVwYXJlRW52KCkKKyAgICAgICAgICAgIHNlbGYuYnJvd3NlckRyaXZl ci5sYXVuY2hVcmwodXJscGFyc2UudXJsam9pbihzZWxmLmh0dHBTZXJ2ZXJEcml2ZXIuYmFzZVVy bCgpLCBzZWxmLnBsYW5bJ2VudHJ5X3BvaW50J10pLCBzZWxmLmJ1aWxkRGlyKQorICAgICAgICAg ICAgdHJ5OgorICAgICAgICAgICAgICAgIHdpdGggdGltZW91dChzZWxmLnBsYW5bJ3RpbWVvdXQn XSk6CisgICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IGpzb24ubG9hZHMoc2VsZi5odHRwU2Vy dmVyRHJpdmVyLmZldGNoUmVzdWx0KCkpCisgICAgICAgICAgICAgICAgYXNzZXJ0KG5vdCBzZWxm Lmh0dHBTZXJ2ZXJEcml2ZXIuZ2V0UmV0dXJuQ29kZSgpKQorICAgICAgICAgICAgICAgIGFzc2Vy dChyZXN1bHQpCisgICAgICAgICAgICAgICAgcmVzdWx0cy5hcHBlbmQocmVzdWx0KQorICAgICAg ICAgICAgZXhjZXB0OgorICAgICAgICAgICAgICAgIF9sb2cuZXJyb3IoJ05vIHJlc3VsdCBvciBz ZXJ2ZXIgY3Jhc2hlcy4gU29tZXRoaW5nIHdlbnQgd3JvbmcuIFdpbGwgc2tpcCBjdXJyZW50IGJl bmNobWFyay4nKQorICAgICAgICAgICAgICAgIHNlbGYuYnJvd3NlckRyaXZlci5jbG9zZUJyb3dz ZXJzKCkKKyAgICAgICAgICAgICAgICBzZWxmLmh0dHBTZXJ2ZXJEcml2ZXIua2lsbFNlcnZlcigp CisgICAgICAgICAgICAgICAgYmVuY2htYXJrQnVpbGRlci5jbGVhbigpCisgICAgICAgICAgICAg ICAgcmV0dXJuIDEKKyAgICAgICAgICAgIGZpbmFsbHk6CisgICAgICAgICAgICAgICAgc2VsZi5i cm93c2VyRHJpdmVyLmNsb3NlQnJvd3NlcnMoKQorICAgICAgICAgICAgICAgIF9sb2cuaW5mbygn RW5kIG9mICVkIGl0ZXJhdGlvbiBvZiBjdXJyZW50IGJlbmNobWFyaycgJSAoeCArIDEpKQorICAg ICAgICByZXN1bHRzID0gc2VsZi53cmFwKHJlc3VsdHMpCisgICAgICAgIHNlbGYuZHVtcChyZXN1 bHRzLCBzZWxmLm91dHB1dEZpbGUgaWYgc2VsZi5vdXRwdXRGaWxlIGVsc2Ugc2VsZi5wbGFuWydv dXRwdXRfZmlsZSddKQorICAgICAgICBiZW5jaG1hcmtCdWlsZGVyLmNsZWFuKCkKKyAgICAgICAg cmV0dXJuIDAKIAogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBkdW1wKGNscywgcmVzdWx0cywg b3V0cHV0RmlsZSk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFy a19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X3NhZmFyaV9kcml2ZXIucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X3NhZmFyaV9k cml2ZXIucHkKaW5kZXggZmJmNDkxZDJkYzQ5ZTI2NTE0ZjMyMTc1ZTFjYjMzNGJiOWFhOWYxMC4u YTYzNjUyYjZmNTM5NzczNDI0MDQ1ZDI1MjIyNzY4NmUxMzE4MzljZCAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9z YWZhcmlfZHJpdmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9icm93c2VyX2RyaXZlci9vc3hfc2FmYXJpX2RyaXZlci5weQpAQCAtOCw2ICs4LDcgQEAg aW1wb3J0IHRpbWUKICMgV2UgYXNzdW1lIHRoYXQgdGhpcyBoYW5kbGUgY2FuIG9ubHkgYmUgdXNl ZCB3aGVuIHRoZSBwbGF0Zm9ybSBpcyBPU1guCiBmcm9tIEFwcEtpdCBpbXBvcnQgTlNSdW5uaW5n QXBwbGljYXRpb24KIGZyb20gYnJvd3Nlcl9kcml2ZXIgaW1wb3J0IEJyb3dzZXJEcml2ZXIKK2Zy b20gd2Via2l0cHkuYmVuY2htYXJrX3J1bm5lci51dGlscyBpbXBvcnQgZm9yY2VSZW1vdmUKIAog CiBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCkBAIC0xNyw2ICsxOCw4IEBAIGNs YXNzIE9TWFNhZmFyaURyaXZlcihCcm93c2VyRHJpdmVyKToKIAogICAgIGRlZiBwcmVwYXJlRW52 KHNlbGYpOgogICAgICAgICBzZWxmLmNsb3NlQnJvd3NlcnMoKQorICAgICAgICBmb3JjZVJlbW92 ZShvcy5wYXRoLmpvaW4ob3MucGF0aC5leHBhbmR1c2VyKCd+JyksICdMaWJyYXJ5L1NhdmVkIEFw cGxpY2F0aW9uIFN0YXRlL2NvbS5hcHBsZS5TYWZhcmkuc2F2ZWRTdGF0ZScpKQorICAgICAgICBm b3JjZVJlbW92ZShvcy5wYXRoLmpvaW4ob3MucGF0aC5leHBhbmR1c2VyKCd+JyksICdMaWJyYXJ5 L1NhZmFyaS9MYXN0U2Vzc2lvbi5wbGlzdCcpKQogICAgICAgICBzZWxmLnNhZmFyaVByZWZlcmVu Y2VzID0gWyItSG9tZVBhZ2UiLCAiYWJvdXQ6YmxhbmsiLCAiLVdhcm5BYm91dEZyYXVkdWxlbnRX ZWJzaXRlcyIsICIwIiwgIi1FeHRlbnNpb25zRW5hYmxlZCIsICIwIiwgIi1TaG93U3RhdHVzQmFy IiwgIjAiLCAiLU5ld1dpbmRvd0JlaGF2aW9yIiwgIjEiLCAiLU5ld1RhYkJlaGF2aW9yIiwgIjEi XQogCiAgICAgZGVmIGxhdW5jaFVybChzZWxmLCB1cmwsIGJyb3dzZXJCdWlsZFBhdGg9Tm9uZSk6 CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0 YS9wYXRjaGVzL0pldFN0cmVhbS5wYXRjaCBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2ht YXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvSmV0U3RyZWFtLnBhdGNoCmluZGV4IDdlMGU1NzUzM2Fk ZGY5ZDYyYTBiNGZiNmM3YzIxYjA0YmU2NzQwOWUuLjA0YmRiZThjMTc3M2MwNjhhODYyYWU4YWEz MTI5Y2I4MDYwODRmNmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2ht YXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvSmV0U3RyZWFtLnBhdGNoCisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvSmV0U3RyZWFtLnBhdGNo CkBAIC0xMCw3ICsxMCw3IEBAIGluZGV4IDczZWU0MjAuLjYwZjU4N2MgMTAwNjQ0CiArICAgIGZ1 bmN0aW9uIGNvbXB1dGVSZWZpbmVkUmVzdWx0cygpewogKyAgICAgICAgdmFyIHJlc3VsdHMgPSB7 fTsKICsgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgYmVuY2htYXJrcy5sZW5ndGg7ICsraSkg ewotKyAgICAgICAgICAgIHJlc3VsdHNbYmVuY2htYXJrc1tpXS5uYW1lXSA9IHsibWV0cmljcyIg OiB7IlNjb3JlIiA6IHsiY3VycmVudCIgOiBbYmVuY2htYXJrc1tpXS50aW1lc119fX07CisrICAg ICAgICAgICAgcmVzdWx0c1tiZW5jaG1hcmtzW2ldLm5hbWVdID0geyJtZXRyaWNzIiA6IHsiU2Nv cmUiIDogeyJjdXJyZW50IiA6IFtiZW5jaG1hcmtzW2ldLnJlc3VsdHNdfX19OwogKyAgICAgICAg fQogKyAgICAgICAgcmV0dXJuIHsiSmV0U3RyZWFtIjogeyJtZXRyaWNzIiA6IHsiU2NvcmUiIDog WyJHZW9tZXRyaWMiXX0sICJ0ZXN0cyIgOiByZXN1bHRzfX07CiArICAgIH0KZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BsYW5zL2pldHN0 cmVhbS5wbGFuIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEv cGxhbnMvamV0c3RyZWFtLnBsYW4KaW5kZXggOWE4OTg4MzRkMzE1M2Y4MmVmYjEzYmQ0ZTRlODMx YTI2MTAxNGFkOS4uYjZlN2UxN2I3NGFiMmUyZDYxMDI4MzMxOTIxNWQ3ZDUzOTExNTNjOCAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGxh bnMvamV0c3RyZWFtLnBsYW4KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtf cnVubmVyL2RhdGEvcGxhbnMvamV0c3RyZWFtLnBsYW4KQEAgLTEsMTQgKzEsMTAgQEAKIHsKICAg ICAiaHR0cF9zZXJ2ZXJfZHJpdmVyIjogIlNpbXBsZUhUVFBTZXJ2ZXJEcml2ZXIiLCAKLSAgICAi YmVuY2htYXJrcyI6IFsKLSAgICAgICAgewotICAgICAgICAgICAgInRpbWVvdXQiIDogNjAwLAot ICAgICAgICAgICAgImNvdW50IjogNSwKLSAgICAgICAgICAgICJiZW5jaG1hcmtfYnVpbGRlciI6 ICJKZXRTdHJlYW1CZW5jaG1hcmtCdWlsZGVyIiwKLSAgICAgICAgICAgICJvcmlnaW5hbF9iZW5j aG1hcmsiOiAiLi4vLi4vLi4vLi4vUGVyZm9ybWFuY2VUZXN0cy9KZXRTdHJlYW0iLAotICAgICAg ICAgICAgImJlbmNobWFya19wYXRjaCI6ICJkYXRhL3BhdGNoZXMvSmV0U3RyZWFtLnBhdGNoIiwK LSAgICAgICAgICAgICJlbnRyeV9wb2ludCI6ICJKZXRTdHJlYW0vSmV0U3RyZWFtLTEuMC4xL2lu ZGV4Lmh0bWwiLAotICAgICAgICAgICAgIm91dHB1dF9maWxlIjogImpldHN0cmVhbS5yZXN1bHQi Ci0gICAgICAgIH0KLSAgICBdCisgICAgInRpbWVvdXQiIDogNjAwLAorICAgICJjb3VudCI6IDUs CisgICAgImJlbmNobWFya19idWlsZGVyIjogIkpldFN0cmVhbUJlbmNobWFya0J1aWxkZXIiLAor ICAgICJvcmlnaW5hbF9iZW5jaG1hcmsiOiAiLi4vLi4vLi4vLi4vUGVyZm9ybWFuY2VUZXN0cy9K ZXRTdHJlYW0iLAorICAgICJiZW5jaG1hcmtfcGF0Y2giOiAiZGF0YS9wYXRjaGVzL0pldFN0cmVh bS5wYXRjaCIsCisgICAgImVudHJ5X3BvaW50IjogIkpldFN0cmVhbS9KZXRTdHJlYW0tMS4wLjEv aW5kZXguaHRtbCIsCisgICAgIm91dHB1dF9maWxlIjogImpldHN0cmVhbS5yZXN1bHQiCiB9CmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9w bGFucy9zcGVlZG9tZXRlci5wbGFuIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtf cnVubmVyL2RhdGEvcGxhbnMvc3BlZWRvbWV0ZXIucGxhbgppbmRleCBjZmYxMGE2ODY4MGNkYTI2 ODliN2JmMzc2Y2IyN2RiY2Y3YTA4YTQ4Li4wMjE0NDM4ZmM2OTVhYWRhZTY5YmEzZDhmZjliODZi NTM5MWNlOGNkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19y dW5uZXIvZGF0YS9wbGFucy9zcGVlZG9tZXRlci5wbGFuCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BsYW5zL3NwZWVkb21ldGVyLnBsYW4KQEAgLTEs MTQgKzEsMTAgQEAKIHsKLSAgICAiYmVuY2htYXJrcyI6IFsKLSAgICAgICAgewotICAgICAgICAg ICAgImJlbmNobWFya19idWlsZGVyIjogIkdlbmVyaWNCZW5jaG1hcmtCdWlsZGVyIiwKLSAgICAg ICAgICAgICJiZW5jaG1hcmtfcGF0Y2giOiAiZGF0YS9wYXRjaGVzL1NwZWVkb21ldGVyLnBhdGNo IiwKLSAgICAgICAgICAgICJvcmlnaW5hbF9iZW5jaG1hcmsiOiAiLi4vLi4vLi4vLi4vUGVyZm9y bWFuY2VUZXN0cy9TcGVlZG9tZXRlciIsCi0gICAgICAgICAgICAiY291bnQiOiA1LAotICAgICAg ICAgICAgImVudHJ5X3BvaW50IjogIlNwZWVkb21ldGVyL0Z1bGwuaHRtbCIsCi0gICAgICAgICAg ICAib3V0cHV0X2ZpbGUiOiAic3BlZWRvbWV0ZXIucmVzdWx0IiwKLSAgICAgICAgICAgICJ0aW1l b3V0IjogNjAwCi0gICAgICAgIH0KLSAgICBdLAotICAgICJodHRwX3NlcnZlcl9kcml2ZXIiOiAi U2ltcGxlSFRUUFNlcnZlckRyaXZlciIKKyAgICAiaHR0cF9zZXJ2ZXJfZHJpdmVyIjogIlNpbXBs ZUhUVFBTZXJ2ZXJEcml2ZXIiLAorICAgICJ0aW1lb3V0IjogMzAwLAorICAgICJjb3VudCI6IDUs CisgICAgImJlbmNobWFya19idWlsZGVyIjogIkdlbmVyaWNCZW5jaG1hcmtCdWlsZGVyIiwKKyAg ICAib3JpZ2luYWxfYmVuY2htYXJrIjogIi4uLy4uLy4uLy4uL1BlcmZvcm1hbmNlVGVzdHMvU3Bl ZWRvbWV0ZXIiLAorICAgICJiZW5jaG1hcmtfcGF0Y2giOiAiZGF0YS9wYXRjaGVzL1NwZWVkb21l dGVyLnBhdGNoIiwKKyAgICAiZW50cnlfcG9pbnQiOiAiU3BlZWRvbWV0ZXIvRnVsbC5odG1sIiwK KyAgICAib3V0cHV0X2ZpbGUiOiAic3BlZWRvbWV0ZXIucmVzdWx0IgogfQpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZl ci9odHRwX3NlcnZlci90d2lzdGVkX2h0dHBfc2VydmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9odHRwX3NlcnZlci90d2lz dGVkX2h0dHBfc2VydmVyLnB5CmluZGV4IDE3MmZjZjI1MzgxMmNhZjRiOTE1ZWI3MTYyMGQ5YTBh MzNkMzM0NDguLjk1M2MwNGQ4YWY2YTA1YWEwN2IyZTU3NzhjNGMzMmYyYWFlZjExMzAgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9odHRwX3NlcnZl cl9kcml2ZXIvaHR0cF9zZXJ2ZXIvdHdpc3RlZF9odHRwX3NlcnZlci5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyL2h0dHBf c2VydmVyL3R3aXN0ZWRfaHR0cF9zZXJ2ZXIucHkKQEAgLTE2LDYgKzE2LDcgQEAgY2xhc3MgU2Vy dmVyQ29udHJvbChSZXNvdXJjZSk6CiAKICAgICBkZWYgcmVuZGVyX1BPU1Qoc2VsZiwgcmVxdWVz dCk6CiAgICAgICAgIHN5cy5zdGRvdXQud3JpdGUocmVxdWVzdC5jb250ZW50LmdldHZhbHVlKCkp CisgICAgICAgIHN5cy5zdGRvdXQuZmx1c2goKQogICAgICAgICByZXR1cm4gJ09LJwogCiAKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9odHRwX3Nl cnZlcl9kcml2ZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9odHRwX3NlcnZlcl9kcml2ZXIu cHkKaW5kZXggMDIwOTRiODJmMjFmMTg4ZTJhYTY4ZWIyMWUzZDg1YjQwNDY5MTFlOS4uOTdlYjQz NjExOWQ1YjBhZGQ0MTdkOTVjODhkOTQ1NzRkOTlhYTNhYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9odHRwX3Nl cnZlcl9kcml2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVu bmVyL2h0dHBfc2VydmVyX2RyaXZlci9odHRwX3NlcnZlcl9kcml2ZXIucHkKQEAgLTExLDMgKzEx LDExIEBAIGNsYXNzIEhUVFBTZXJ2ZXJEcml2ZXIob2JqZWN0KToKICAgICBAYWJzdHJhY3RtZXRo b2QKICAgICBkZWYgZmV0Y2hSZXN1bHQoc2VsZik6CiAgICAgICAgIHBhc3MKKworICAgIEBhYnN0 cmFjdG1ldGhvZAorICAgIGRlZiBraWxsU2VydmVyKHNlbGYpOgorICAgICAgICBwYXNzCisKKyAg ICBAYWJzdHJhY3RtZXRob2QKKyAgICBkZWYgZ2V0UmV0dXJuQ29kZShzZWxmKToKKyAgICAgICAg cGFzcwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVy L2h0dHBfc2VydmVyX2RyaXZlci9zaW1wbGVfaHR0cF9zZXJ2ZXJfZHJpdmVyLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9zaW1w bGVfaHR0cF9zZXJ2ZXJfZHJpdmVyLnB5CmluZGV4IGE0MjkyYTY2MjMwODAzZjliZmNhNjFjNzJh MjFlNWFjZDE2ZmMzNzkuLmI2NmI0ZjY3YjJiYzA1Zjg4MWVhZTI5YTlmZDY3Y2ZjZTkwYWVlYzcg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9odHRw X3NlcnZlcl9kcml2ZXIvc2ltcGxlX2h0dHBfc2VydmVyX2RyaXZlci5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyL3NpbXBs ZV9odHRwX3NlcnZlcl9kcml2ZXIucHkKQEAgLTMwLDExICszMCwxMSBAQCBjbGFzcyBTaW1wbGVI VFRQU2VydmVyRHJpdmVyKEhUVFBTZXJ2ZXJEcml2ZXIpOgogICAgICAgICAgICAgX2xvZy5lcnJv cignQ2Fubm90IGdldCB0aGUgaXAgYWRkcmVzcyBvZiBjdXJyZW50IG1hY2hpbmUnKQogICAgICAg ICAgICAgcmFpc2UKIAotICAgIGRlZiBzZXJ2ZShzZWxmLCB3ZWJyb290KToKKyAgICBkZWYgc2Vy dmUoc2VsZiwgd2ViUm9vdCk6CiAgICAgICAgIG9sZFdvcmtpbmdEaXJlY3RvcnkgPSBvcy5nZXRj d2QoKQogICAgICAgICBvcy5jaGRpcihvcy5wYXRoLmRpcm5hbWUob3MucGF0aC5hYnNwYXRoKF9f ZmlsZV9fKSkpCi0gICAgICAgIF9sb2cuaW5mbygnTGF1Y2huaW5nIGFuIGh0dHAgc2VydmVyJykK LSAgICAgICAgc2VsZi5zZXJ2ZXJQcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3BlbihbJy91c3IvYmlu L3B5dGhvbicsICdodHRwX3NlcnZlci90d2lzdGVkX2h0dHBfc2VydmVyLnB5Jywgd2Vicm9vdF0s IHN0ZGluPXN1YnByb2Nlc3MuUElQRSwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwgc3RkZXJyPXN1 YnByb2Nlc3MuUElQRSkKKyAgICAgICAgX2xvZy5pbmZvKCdMYXVuY2hpbmcgYW4gaHR0cCBzZXJ2 ZXInKQorICAgICAgICBzZWxmLnNlcnZlclByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKFsnL3Vz ci9iaW4vcHl0aG9uJywgJ2h0dHBfc2VydmVyL3R3aXN0ZWRfaHR0cF9zZXJ2ZXIucHknLCB3ZWJS b290XSwgc3RkaW49c3VicHJvY2Vzcy5QSVBFLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLCBzdGRl cnI9c3VicHJvY2Vzcy5QSVBFKQogICAgICAgICBvcy5jaGRpcihvbGRXb3JraW5nRGlyZWN0b3J5 KQogICAgICAgICBtYXhBdHRlbXB0ID0gNQogICAgICAgICBpbnRlcnZhbCA9IDAuNQpAQCAtNzcs MyArNzcsMTIgQEAgY2xhc3MgU2ltcGxlSFRUUFNlcnZlckRyaXZlcihIVFRQU2VydmVyRHJpdmVy KToKIAogICAgIGRlZiBmZXRjaFJlc3VsdChzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuc2Vy dmVyUHJvY2Vzcy5jb21tdW5pY2F0ZSgpWzBdCisKKyAgICBkZWYga2lsbFNlcnZlcihzZWxmKToK KyAgICAgICAgdHJ5OgorICAgICAgICAgICAgc2VsZi5zZXJ2ZXJQcm9jZXNzLnRlcm1pbmF0ZSgp CisgICAgICAgIGV4Y2VwdCBPU0Vycm9yOgorICAgICAgICAgICAgX2xvZy5pbmZvKCdJbnZhbGlk IHBpZCwgc2VydmVyIG1heSBleGl0IHByb3Blcmx5JykKKworICAgIGRlZiBnZXRSZXR1cm5Db2Rl KHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5zZXJ2ZXJQcm9jZXNzLnJldHVybmNvZGUKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci91dGlscy5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci91dGlscy5weQppbmRl eCA2YmM0YjY4ZTk1MWVhNDAwOTI1OGYyZDkwZTU0ODI4YzBkZTY2NGFhLi5kOGQwNTVjNTZkM2Vj NDkwMzAyMjQwZjA5YTQ5MjA3MjY4YTdhODQ2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2JlbmNobWFya19ydW5uZXIvdXRpbHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9iZW5jaG1hcmtfcnVubmVyL3V0aWxzLnB5CkBAIC00LDYgKzQsNyBAQCBpbXBvcnQganNv bgogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcwogaW1wb3J0IHNpZ25hbAoraW1wb3J0IHNodXRp bAogCiAKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKQEAgLTM3LDYgKzM4LDEz IEBAIGRlZiBsb2FkSlNPTkZyb21GaWxlKGZpbGVQYXRoKToKICAgICAgICAgcmFpc2UgRXhjZXB0 aW9uKCJJbnZhbGlkIGpzb24gZm9ybWF0IG9yIGVtcHR5IGpzb24gd2FzIGZvdW5kIGluICVzIiAl IChmaWxlUGF0aCkpCiAKIAorZGVmIGZvcmNlUmVtb3ZlKHBhdGgpOgorICAgIHRyeToKKyAgICAg ICAgc2h1dGlsLnJtdHJlZShwYXRoKQorICAgIGV4Y2VwdDoKKyAgICAgICAgIyBEaXJlY3Rvcnkv ZmlsZSBkb2VzIG5vdCBleGlzdCBvciBwcml2aWxlZ2UgaXNzdWUsIGp1c3QgaWdub3JlIGl0Cisg ICAgICAgIHBhc3MKKwogIyBCb3Jyb3cgdGhpcyBjb2RlIGZyb20KICMgJ2h0dHA6Ly9zdGFja292 ZXJmbG93LmNvbS9xdWVzdGlvbnMvMjI4MTg1MC90aW1lb3V0LWZ1bmN0aW9uLWlmLWl0LXRha2Vz LXRvby1sb25nLXRvLWZpbmlzaCcKIGNsYXNzIFRpbWVvdXRFcnJvcihFeGNlcHRpb24pOgo=