191340 2018-11-06 16:55:03 -0800 Web Inspector: Fix "Javascript" => "JavaScript" enum in protocol generated objects 2018-11-07 11:49:22 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue ews-watchlist hi inspector-bugzilla-changes joepeck keith_miller mark.lam mattbaker msaboff saam webkit-bug-importer oldest_to_newest 1475773 0 joepeck 2018-11-06 16:55:03 -0800 Fix "Javascript" => "JavaScript" enum in protocol generated objects 1475774 1 354033 joepeck 2018-11-06 16:57:46 -0800 Created attachment 354033 [PATCH] Proposed Fix 1475775 2 ews-watchlist 2018-11-06 16:59:29 -0800 This patch modifies the inspector protocol generator. Please ensure that you have rebaselined any generator test results (i.e., by running `Tools/Scripts/run-inspector-generator-tests --reset-results`) 1475794 3 354033 mattbaker 2018-11-06 17:46:41 -0800 Comment on attachment 354033 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=354033&action=review Looks good, except for the issue mentioned. > Source/WebInspectorUI/UserInterface/Protocol/Legacy/11.3/InspectorBackendCommands.js:70 > +InspectorBackend.registerEnum("Canvas.ContextType", {Canvas2D: "canvas-2d", BitmapRenderer: "bitmaprenderer", WebGL: "webgl", WebGL2: "webgl2", Webgpu: "webgpu"}); The frontend uses CanvasAgent.ContextType.WebGPU. This change causes calls to InspectorCanvasAgent::requestContent to fail with "unsupported canvas context type". 1475828 4 354049 joepeck 2018-11-06 19:01:25 -0800 Created attachment 354049 [PATCH] Proposed Fix 1475829 5 354033 joepeck 2018-11-06 19:01:44 -0800 Comment on attachment 354033 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=354033&action=review >> Source/WebInspectorUI/UserInterface/Protocol/Legacy/11.3/InspectorBackendCommands.js:70 >> +InspectorBackend.registerEnum("Canvas.ContextType", {Canvas2D: "canvas-2d", BitmapRenderer: "bitmaprenderer", WebGL: "webgl", WebGL2: "webgl2", Webgpu: "webgpu"}); > > The frontend uses CanvasAgent.ContextType.WebGPU. This change causes calls to InspectorCanvasAgent::requestContent to fail with "unsupported canvas context type". Hmm, a couple things. • This seems to be a pre-existing mistake. Nothing in the frontend used `CanvasAgent.ContextType.Webgpu` only `CanvasAgent.ContextType.WebGPU` so this would be fixing iOS 11 support. • However, WI.Canvas.fromPayload has a mistake (missing `break`) that needs to be fixed! Other than that, this is just changing the enum name, not the protocol string, so it's fine to make this change otherwise. I'll update. 1475831 6 joepeck 2018-11-06 19:02:02 -0800 Updated patch. 1475881 7 354049 hi 2018-11-06 22:11:15 -0800 Comment on attachment 354049 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=354049&action=review r=me > Source/JavaScriptCore/inspector/scripts/codegen/generator.py:45 > +_ALWAYS_SPECIALCASED_ENUM_VALUE_SUBSTRINGS = set(['2D', 'API', 'CSS', 'DOM', 'HTML', 'JIT', 'XHR', 'XML', 'IOS', 'MacOS', 'JavaScript']) While we're at it, shouldn't "IOS" be "iOS" and "MacOS" be "macOS"? 1476080 8 joepeck 2018-11-07 11:22:13 -0800 (In reply to Devin Rousso from comment #7) > Comment on attachment 354049 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=354049&action=review > > r=me > > > Source/JavaScriptCore/inspector/scripts/codegen/generator.py:45 > > +_ALWAYS_SPECIALCASED_ENUM_VALUE_SUBSTRINGS = set(['2D', 'API', 'CSS', 'DOM', 'HTML', 'JIT', 'XHR', 'XML', 'IOS', 'MacOS', 'JavaScript']) > > While we're at it, shouldn't "IOS" be "iOS" and "MacOS" be "macOS"? These would be for enum values. I don't think we'd want those representations since we generally start them with a capital. 1476103 9 354049 commit-queue 2018-11-07 11:48:13 -0800 Comment on attachment 354049 [PATCH] Proposed Fix Clearing flags on attachment: 354049 Committed r237934: <https://trac.webkit.org/changeset/237934> 1476104 10 commit-queue 2018-11-07 11:48:15 -0800 All reviewed patches have been landed. Closing bug. 1476105 11 webkit-bug-importer 2018-11-07 11:49:22 -0800 <rdar://problem/45884080> 354033 2018-11-06 16:57:46 -0800 2018-11-06 19:01:25 -0800 [PATCH] Proposed Fix js-case-1.patch text/plain 25816 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDY3ZTQ4NTk0ZmE5Li4zNDI3NmI3NWU4MSAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTgtMTEtMDYgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBGaXggIkphdmFzY3JpcHQiID0+ICJKYXZhU2NyaXB0IiBlbnVtIGluIHByb3RvY29sIGdlbmVy YXRlZCBvYmplY3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTEzNDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGluc3BlY3Rvci9Db25zb2xlTWVzc2FnZS5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6 Om1lc3NhZ2VTb3VyY2VWYWx1ZSk6CisgICAgICAgIFVzZSBuZXcgZW51bSBuYW1lLgorCisgICAg ICAgICogaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0b3IucHk6CisgICAgICAgIENv cnJlY3QgdGhlIGNhc2luZyBvZiAiSmF2YVNjcmlwdCIuCisKIDIwMTgtMTEtMDUgIERvbiBPbG1z dGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAgICAgICBGaXggdHlwb3MgaW4gY2xv c2luZyBFTkFCTEUgZ3VhcmRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5z cGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvQ29uc29sZU1lc3NhZ2UuY3BwCmluZGV4IGE1ZGUwNjVjYmRjLi43MTZhYzQ0MWI3YyAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9Db25zb2xlTWVzc2FnZS5j cHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9Db25zb2xlTWVzc2FnZS5j cHAKQEAgLTE1OCw3ICsxNTgsNyBAQCBzdGF0aWMgUHJvdG9jb2w6OkNvbnNvbGU6OkNoYW5uZWxT b3VyY2UgbWVzc2FnZVNvdXJjZVZhbHVlKE1lc3NhZ2VTb3VyY2Ugc291cmNlKQogewogICAgIHN3 aXRjaCAoc291cmNlKSB7CiAgICAgY2FzZSBNZXNzYWdlU291cmNlOjpYTUw6IHJldHVybiBQcm90 b2NvbDo6Q29uc29sZTo6Q2hhbm5lbFNvdXJjZTo6WE1MOwotICAgIGNhc2UgTWVzc2FnZVNvdXJj ZTo6SlM6IHJldHVybiBQcm90b2NvbDo6Q29uc29sZTo6Q2hhbm5lbFNvdXJjZTo6SmF2YXNjcmlw dDsKKyAgICBjYXNlIE1lc3NhZ2VTb3VyY2U6OkpTOiByZXR1cm4gUHJvdG9jb2w6OkNvbnNvbGU6 OkNoYW5uZWxTb3VyY2U6OkphdmFTY3JpcHQ7CiAgICAgY2FzZSBNZXNzYWdlU291cmNlOjpOZXR3 b3JrOiByZXR1cm4gUHJvdG9jb2w6OkNvbnNvbGU6OkNoYW5uZWxTb3VyY2U6Ok5ldHdvcms7CiAg ICAgY2FzZSBNZXNzYWdlU291cmNlOjpDb25zb2xlQVBJOiByZXR1cm4gUHJvdG9jb2w6OkNvbnNv bGU6OkNoYW5uZWxTb3VyY2U6OkNvbnNvbGVBUEk7CiAgICAgY2FzZSBNZXNzYWdlU291cmNlOjpT dG9yYWdlOiByZXR1cm4gUHJvdG9jb2w6OkNvbnNvbGU6OkNoYW5uZWxTb3VyY2U6OlN0b3JhZ2U7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29k ZWdlbi9nZW5lcmF0b3IucHkgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Njcmlw dHMvY29kZWdlbi9nZW5lcmF0b3IucHkKaW5kZXggMzhhNTk3OTJhMDQuLmRkZGJlMjZhMDI5IDEw MDc1NQotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdl bi9nZW5lcmF0b3IucHkKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3Jp cHRzL2NvZGVnZW4vZ2VuZXJhdG9yLnB5CkBAIC00Miw3ICs0Miw3IEBAIGxvZyA9IGxvZ2dpbmcu Z2V0TG9nZ2VyKCdnbG9iYWwnKQogZGVmIHVjZmlyc3Qoc3RyKToKICAgICByZXR1cm4gc3RyWzox XS51cHBlcigpICsgc3RyWzE6XQogCi1fQUxXQVlTX1NQRUNJQUxDQVNFRF9FTlVNX1ZBTFVFX1NV QlNUUklOR1MgPSBzZXQoWycyRCcsICdBUEknLCAnQ1NTJywgJ0RPTScsICdIVE1MJywgJ0pJVCcs ICdYSFInLCAnWE1MJywgJ0lPUycsICdNYWNPUyddKQorX0FMV0FZU19TUEVDSUFMQ0FTRURfRU5V TV9WQUxVRV9TVUJTVFJJTkdTID0gc2V0KFsnMkQnLCAnQVBJJywgJ0NTUycsICdET00nLCAnSFRN TCcsICdKSVQnLCAnWEhSJywgJ1hNTCcsICdJT1MnLCAnTWFjT1MnLCAnSmF2YVNjcmlwdCddKQog X0FMV0FZU19TUEVDSUFMQ0FTRURfRU5VTV9WQUxVRV9MT09LVVBfVEFCTEUgPSBkaWN0KFsocy51 cHBlcigpLCBzKSBmb3IgcyBpbiBfQUxXQVlTX1NQRUNJQUxDQVNFRF9FTlVNX1ZBTFVFX1NVQlNU UklOR1NdKQogCiBfRU5VTV9JREVOVElGSUVSX1JFTkFNRV9NQVAgPSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWI2OTRkYTFiZGIuLmFjOGRjYzNjY2JjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIw MTgtMTEtMDYgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAg ICBXZWIgSW5zcGVjdG9yOiBGaXggIkphdmFzY3JpcHQiID0+ICJKYXZhU2NyaXB0IiBlbnVtIGlu IHByb3RvY29sIGdlbmVyYXRlZCBvYmplY3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTEzNDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yTWVtb3J5QWdl bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yTWVtb3J5QWdlbnQ6OmNvbGxlY3RT YW1wbGUpOgorICAgICAgICBVc2UgbmV3IGVudW0gbmFtZS4KKwogMjAxOC0xMS0wNSAgTXlsZXMg Qy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFBhcnNpbmcgc3Vw cG9ydCBmb3IgdGV4dC11bmRlcmxpbmUtb2Zmc2V0IGFuZCB0ZXh0LWRlY29yYXRpb24tdGhpY2tu ZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rv ck1lbW9yeUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVj dG9yTWVtb3J5QWdlbnQuY3BwCmluZGV4IDYzMGJlODgyNDljLi43NjhhNmRhOTE4YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JNZW1vcnlBZ2Vu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JNZW1v cnlBZ2VudC5jcHAKQEAgLTEwNyw3ICsxMDcsNyBAQCB2b2lkIEluc3BlY3Rvck1lbW9yeUFnZW50 OjpkaWRIYW5kbGVNZW1vcnlQcmVzc3VyZShDcml0aWNhbCBjcml0aWNhbCkKIHZvaWQgSW5zcGVj dG9yTWVtb3J5QWdlbnQ6OmNvbGxlY3RTYW1wbGUoY29uc3QgUmVzb3VyY2VVc2FnZURhdGEmIGRh dGEpCiB7CiAgICAgYXV0byBqYXZhc2NyaXB0Q2F0ZWdvcnkgPSBQcm90b2NvbDo6TWVtb3J5OjpD YXRlZ29yeURhdGE6OmNyZWF0ZSgpCi0gICAgICAgIC5zZXRUeXBlKFByb3RvY29sOjpNZW1vcnk6 OkNhdGVnb3J5RGF0YTo6VHlwZTo6SmF2YXNjcmlwdCkKKyAgICAgICAgLnNldFR5cGUoUHJvdG9j b2w6Ok1lbW9yeTo6Q2F0ZWdvcnlEYXRhOjpUeXBlOjpKYXZhU2NyaXB0KQogICAgICAgICAuc2V0 U2l6ZShkYXRhLmNhdGVnb3JpZXNbTWVtb3J5Q2F0ZWdvcnk6OkdDSGVhcF0udG90YWxTaXplKCkg KyBkYXRhLmNhdGVnb3JpZXNbTWVtb3J5Q2F0ZWdvcnk6OkdDT3duZWRdLnRvdGFsU2l6ZSgpKQog ICAgICAgICAucmVsZWFzZSgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv Q2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA2MWRhYTUw MjdhNi4uODRjMjE3YWJjNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDE4LTExLTA2ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisK KyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4ICJKYXZhc2NyaXB0IiA9PiAiSmF2YVNjcmlwdCIg ZW51bSBpbiBwcm90b2NvbCBnZW5lcmF0ZWQgb2JqZWN0cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMzQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9NZW1vcnlU aW1lbGluZVJlY29yZC5qczoKKyAgICAgICAgKFdJLk1lbW9yeVRpbWVsaW5lUmVjb3JkLm1lbW9y eUNhdGVnb3JpZXNGcm9tUHJvdG9jb2wpOgorICAgICAgICBVc2UgbmV3IGVudW0gbmFtZS4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzEwLjAvSW5zcGVjdG9yQmFj a2VuZENvbW1hbmRzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5 LzEwLjMvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvUHJvdG9jb2wvTGVnYWN5LzExLjAvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzExLjMvSW5zcGVjdG9yQmFja2Vu ZENvbW1hbmRzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzEy LjAvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv UHJvdG9jb2wvTGVnYWN5LzguMC9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanM6CisgICAgICAg ICogVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvOS4wL0luc3BlY3RvckJhY2tlbmRDb21t YW5kcy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS85LjMvSW5z cGVjdG9yQmFja2VuZENvbW1hbmRzLmpzOgorICAgICAgICBVcGRhdGUgZW51bXMgd2l0aCBuZXcg Z2VuZXJhdG9yLgorCiAyMDE4LTExLTA1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBdWRpdDogdHVybiBvZmYgU3RhcnQgYnV0dG9u IHdoZW4gYWxsIHRlc3RzIGFyZSByZW1vdmVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTWVtb3J5VGltZWxpbmVSZWNvcmQuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTWVtb3J5VGltZWxpbmVSZWNv cmQuanMKaW5kZXggMGEzZDRiNDYwY2MuLjYzOTU4MTc1ZGMzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTWVtb3J5VGltZWxpbmVSZWNvcmQu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL01lbW9y eVRpbWVsaW5lUmVjb3JkLmpzCkBAIC01MSw3ICs1MSw3IEBAIFdJLk1lbW9yeVRpbWVsaW5lUmVj b3JkID0gY2xhc3MgTWVtb3J5VGltZWxpbmVSZWNvcmQgZXh0ZW5kcyBXSS5UaW1lbGluZVJlY29y ZAogCiAgICAgICAgIGZvciAobGV0IHt0eXBlLCBzaXplfSBvZiBjYXRlZ29yaWVzKSB7CiAgICAg ICAgICAgICBzd2l0Y2ggKHR5cGUpIHsKLSAgICAgICAgICAgIGNhc2UgTWVtb3J5QWdlbnQuQ2F0 ZWdvcnlEYXRhVHlwZS5KYXZhc2NyaXB0OgorICAgICAgICAgICAgY2FzZSBNZW1vcnlBZ2VudC5D YXRlZ29yeURhdGFUeXBlLkphdmFTY3JpcHQ6CiAgICAgICAgICAgICBjYXNlIE1lbW9yeUFnZW50 LkNhdGVnb3J5RGF0YVR5cGUuSklUOgogICAgICAgICAgICAgICAgIGphdmFzY3JpcHRTaXplICs9 IHNpemU7CiAgICAgICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvMTAuMC9JbnNwZWN0b3JCYWNr ZW5kQ29tbWFuZHMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90 b2NvbC9MZWdhY3kvMTAuMC9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMKaW5kZXggODNjZjgz NTcyY2MuLjhkY2M4MTUyYmE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvMTAuMC9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVn YWN5LzEwLjAvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCkBAIC03NCw3ICs3NCw3IEBAIElu c3BlY3RvckJhY2tlbmQuYWN0aXZhdGVEb21haW4oIkNTUyIsIFsid2ViIl0pOwogCiAvLyBDb25z b2xlLgogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNvbnNvbGVEaXNwYXRjaGVyID0gSW5zcGVj dG9yQmFja2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIuYmluZChJbnNwZWN0b3JCYWNrZW5k LCAiQ29uc29sZSIpOwotSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ29u c29sZU1lc3NhZ2VTb3VyY2UiLCB7WE1MOiAieG1sIiwgSmF2YXNjcmlwdDogImphdmFzY3JpcHQi LCBOZXR3b3JrOiAibmV0d29yayIsIENvbnNvbGVBUEk6ICJjb25zb2xlLWFwaSIsIFN0b3JhZ2U6 ICJzdG9yYWdlIiwgQXBwY2FjaGU6ICJhcHBjYWNoZSIsIFJlbmRlcmluZzogInJlbmRlcmluZyIs IENTUzogImNzcyIsIFNlY3VyaXR5OiAic2VjdXJpdHkiLCBDb250ZW50QmxvY2tlcjogImNvbnRl bnQtYmxvY2tlciIsIE90aGVyOiAib3RoZXIifSk7CitJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVy RW51bSgiQ29uc29sZS5Db25zb2xlTWVzc2FnZVNvdXJjZSIsIHtYTUw6ICJ4bWwiLCBKYXZhU2Ny aXB0OiAiamF2YXNjcmlwdCIsIE5ldHdvcms6ICJuZXR3b3JrIiwgQ29uc29sZUFQSTogImNvbnNv bGUtYXBpIiwgU3RvcmFnZTogInN0b3JhZ2UiLCBBcHBjYWNoZTogImFwcGNhY2hlIiwgUmVuZGVy aW5nOiAicmVuZGVyaW5nIiwgQ1NTOiAiY3NzIiwgU2VjdXJpdHk6ICJzZWN1cml0eSIsIENvbnRl bnRCbG9ja2VyOiAiY29udGVudC1ibG9ja2VyIiwgT3RoZXI6ICJvdGhlciJ9KTsKIEluc3BlY3Rv ckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJDb25zb2xlLkNvbnNvbGVNZXNzYWdlTGV2ZWwiLCB7TG9n OiAibG9nIiwgSW5mbzogImluZm8iLCBXYXJuaW5nOiAid2FybmluZyIsIEVycm9yOiAiZXJyb3Ii LCBEZWJ1ZzogImRlYnVnIn0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNv bGUuQ29uc29sZU1lc3NhZ2VUeXBlIiwge0xvZzogImxvZyIsIERpcjogImRpciIsIERpclhNTDog ImRpcnhtbCIsIFRhYmxlOiAidGFibGUiLCBUcmFjZTogInRyYWNlIiwgQ2xlYXI6ICJjbGVhciIs IFN0YXJ0R3JvdXA6ICJzdGFydEdyb3VwIiwgU3RhcnRHcm91cENvbGxhcHNlZDogInN0YXJ0R3Jv dXBDb2xsYXBzZWQiLCBFbmRHcm91cDogImVuZEdyb3VwIiwgQXNzZXJ0OiAiYXNzZXJ0IiwgVGlt aW5nOiAidGltaW5nIiwgUHJvZmlsZTogInByb2ZpbGUiLCBQcm9maWxlRW5kOiAicHJvZmlsZUVu ZCJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFdmVudCgiQ29uc29sZS5tZXNzYWdlQWRk ZWQiLCBbIm1lc3NhZ2UiXSk7CkBAIC0yNTEsNyArMjUxLDcgQEAgSW5zcGVjdG9yQmFja2VuZC5h Y3RpdmF0ZURvbWFpbigiTGF5ZXJUcmVlIiwgWyJ3ZWIiXSk7CiAKIC8vIE1lbW9yeS4KIEluc3Bl Y3RvckJhY2tlbmQucmVnaXN0ZXJNZW1vcnlEaXNwYXRjaGVyID0gSW5zcGVjdG9yQmFja2VuZC5y ZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIuYmluZChJbnNwZWN0b3JCYWNrZW5kLCAiTWVtb3J5Iik7 Ci1JbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiTWVtb3J5LkNhdGVnb3J5RGF0YVR5cGUi LCB7SmF2YXNjcmlwdDogImphdmFzY3JpcHQiLCBKSVQ6ICJqaXQiLCBJbWFnZXM6ICJpbWFnZXMi LCBMYXllcnM6ICJsYXllcnMiLCBQYWdlOiAicGFnZSIsIE90aGVyOiAib3RoZXIifSk7CitJbnNw ZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiTWVtb3J5LkNhdGVnb3J5RGF0YVR5cGUiLCB7SmF2 YVNjcmlwdDogImphdmFzY3JpcHQiLCBKSVQ6ICJqaXQiLCBJbWFnZXM6ICJpbWFnZXMiLCBMYXll cnM6ICJsYXllcnMiLCBQYWdlOiAicGFnZSIsIE90aGVyOiAib3RoZXIifSk7CiBJbnNwZWN0b3JC YWNrZW5kLnJlZ2lzdGVyRW51bSgiTWVtb3J5Lk1lbW9yeVByZXNzdXJlU2V2ZXJpdHkiLCB7Q3Jp dGljYWw6ICJjcml0aWNhbCIsIE5vbkNyaXRpY2FsOiAibm9uLWNyaXRpY2FsIn0pOwogSW5zcGVj dG9yQmFja2VuZC5yZWdpc3RlckV2ZW50KCJNZW1vcnkubWVtb3J5UHJlc3N1cmUiLCBbInRpbWVz dGFtcCIsICJzZXZlcml0eSJdKTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFdmVudCgiTWVt b3J5LnRyYWNraW5nU3RhcnQiLCBbInRpbWVzdGFtcCJdKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS8xMC4zL0luc3BlY3Rv ckJhY2tlbmRDb21tYW5kcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1Byb3RvY29sL0xlZ2FjeS8xMC4zL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcwppbmRleCA2 NTVjZGFiNmU4ZC4uNzI4MTU3ZTQzMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS8xMC4zL0luc3BlY3RvckJhY2tlbmRDb21t YW5kcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2Nv bC9MZWdhY3kvMTAuMy9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMKQEAgLTc0LDcgKzc0LDcg QEAgSW5zcGVjdG9yQmFja2VuZC5hY3RpdmF0ZURvbWFpbigiQ1NTIiwgWyJ3ZWIiXSk7CiAKIC8v IENvbnNvbGUuCiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29uc29sZURpc3BhdGNoZXIgPSBJ bnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRG9tYWluRGlzcGF0Y2hlci5iaW5kKEluc3BlY3RvckJh Y2tlbmQsICJDb25zb2xlIik7Ci1JbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiQ29uc29s ZS5Db25zb2xlTWVzc2FnZVNvdXJjZSIsIHtYTUw6ICJ4bWwiLCBKYXZhc2NyaXB0OiAiamF2YXNj cmlwdCIsIE5ldHdvcms6ICJuZXR3b3JrIiwgQ29uc29sZUFQSTogImNvbnNvbGUtYXBpIiwgU3Rv cmFnZTogInN0b3JhZ2UiLCBBcHBjYWNoZTogImFwcGNhY2hlIiwgUmVuZGVyaW5nOiAicmVuZGVy aW5nIiwgQ1NTOiAiY3NzIiwgU2VjdXJpdHk6ICJzZWN1cml0eSIsIENvbnRlbnRCbG9ja2VyOiAi Y29udGVudC1ibG9ja2VyIiwgT3RoZXI6ICJvdGhlciJ9KTsKK0luc3BlY3RvckJhY2tlbmQucmVn aXN0ZXJFbnVtKCJDb25zb2xlLkNvbnNvbGVNZXNzYWdlU291cmNlIiwge1hNTDogInhtbCIsIEph dmFTY3JpcHQ6ICJqYXZhc2NyaXB0IiwgTmV0d29yazogIm5ldHdvcmsiLCBDb25zb2xlQVBJOiAi Y29uc29sZS1hcGkiLCBTdG9yYWdlOiAic3RvcmFnZSIsIEFwcGNhY2hlOiAiYXBwY2FjaGUiLCBS ZW5kZXJpbmc6ICJyZW5kZXJpbmciLCBDU1M6ICJjc3MiLCBTZWN1cml0eTogInNlY3VyaXR5Iiwg Q29udGVudEJsb2NrZXI6ICJjb250ZW50LWJsb2NrZXIiLCBPdGhlcjogIm90aGVyIn0pOwogSW5z cGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ29uc29sZU1lc3NhZ2VMZXZlbCIs IHtMb2c6ICJsb2ciLCBJbmZvOiAiaW5mbyIsIFdhcm5pbmc6ICJ3YXJuaW5nIiwgRXJyb3I6ICJl cnJvciIsIERlYnVnOiAiZGVidWcifSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgi Q29uc29sZS5Db25zb2xlTWVzc2FnZVR5cGUiLCB7TG9nOiAibG9nIiwgRGlyOiAiZGlyIiwgRGly WE1MOiAiZGlyeG1sIiwgVGFibGU6ICJ0YWJsZSIsIFRyYWNlOiAidHJhY2UiLCBDbGVhcjogImNs ZWFyIiwgU3RhcnRHcm91cDogInN0YXJ0R3JvdXAiLCBTdGFydEdyb3VwQ29sbGFwc2VkOiAic3Rh cnRHcm91cENvbGxhcHNlZCIsIEVuZEdyb3VwOiAiZW5kR3JvdXAiLCBBc3NlcnQ6ICJhc3NlcnQi LCBUaW1pbmc6ICJ0aW1pbmciLCBQcm9maWxlOiAicHJvZmlsZSIsIFByb2ZpbGVFbmQ6ICJwcm9m aWxlRW5kIn0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2ZW50KCJDb25zb2xlLm1lc3Nh Z2VBZGRlZCIsIFsibWVzc2FnZSJdKTsKQEAgLTI1OCw3ICsyNTgsNyBAQCBJbnNwZWN0b3JCYWNr ZW5kLmFjdGl2YXRlRG9tYWluKCJMYXllclRyZWUiLCBbIndlYiJdKTsKIAogLy8gTWVtb3J5Lgog SW5zcGVjdG9yQmFja2VuZC5yZWdpc3Rlck1lbW9yeURpc3BhdGNoZXIgPSBJbnNwZWN0b3JCYWNr ZW5kLnJlZ2lzdGVyRG9tYWluRGlzcGF0Y2hlci5iaW5kKEluc3BlY3RvckJhY2tlbmQsICJNZW1v cnkiKTsKLUluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJNZW1vcnkuQ2F0ZWdvcnlEYXRh VHlwZSIsIHtKYXZhc2NyaXB0OiAiamF2YXNjcmlwdCIsIEpJVDogImppdCIsIEltYWdlczogImlt YWdlcyIsIExheWVyczogImxheWVycyIsIFBhZ2U6ICJwYWdlIiwgT3RoZXI6ICJvdGhlciJ9KTsK K0luc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJNZW1vcnkuQ2F0ZWdvcnlEYXRhVHlwZSIs IHtKYXZhU2NyaXB0OiAiamF2YXNjcmlwdCIsIEpJVDogImppdCIsIEltYWdlczogImltYWdlcyIs IExheWVyczogImxheWVycyIsIFBhZ2U6ICJwYWdlIiwgT3RoZXI6ICJvdGhlciJ9KTsKIEluc3Bl Y3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJNZW1vcnkuTWVtb3J5UHJlc3N1cmVTZXZlcml0eSIs IHtDcml0aWNhbDogImNyaXRpY2FsIiwgTm9uQ3JpdGljYWw6ICJub24tY3JpdGljYWwifSk7CiBJ bnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRXZlbnQoIk1lbW9yeS5tZW1vcnlQcmVzc3VyZSIsIFsi dGltZXN0YW1wIiwgInNldmVyaXR5Il0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2ZW50 KCJNZW1vcnkudHJhY2tpbmdTdGFydCIsIFsidGltZXN0YW1wIl0pOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzExLjAvSW5z cGVjdG9yQmFja2VuZENvbW1hbmRzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvUHJvdG9jb2wvTGVnYWN5LzExLjAvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCmlu ZGV4IDA2ZWE0ZTFjMzhmLi5mYjQwYTc3ZWNiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzExLjAvSW5zcGVjdG9yQmFja2Vu ZENvbW1hbmRzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1By b3RvY29sL0xlZ2FjeS8xMS4wL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcwpAQCAtNzQsNyAr NzQsNyBAQCBJbnNwZWN0b3JCYWNrZW5kLmFjdGl2YXRlRG9tYWluKCJDU1MiLCBbIndlYiJdKTsK IAogLy8gQ29uc29sZS4KIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJDb25zb2xlRGlzcGF0Y2hl ciA9IEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJEb21haW5EaXNwYXRjaGVyLmJpbmQoSW5zcGVj dG9yQmFja2VuZCwgIkNvbnNvbGUiKTsKLUluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJD b25zb2xlLkNvbnNvbGVNZXNzYWdlU291cmNlIiwge1hNTDogInhtbCIsIEphdmFzY3JpcHQ6ICJq YXZhc2NyaXB0IiwgTmV0d29yazogIm5ldHdvcmsiLCBDb25zb2xlQVBJOiAiY29uc29sZS1hcGki LCBTdG9yYWdlOiAic3RvcmFnZSIsIEFwcGNhY2hlOiAiYXBwY2FjaGUiLCBSZW5kZXJpbmc6ICJy ZW5kZXJpbmciLCBDU1M6ICJjc3MiLCBTZWN1cml0eTogInNlY3VyaXR5IiwgQ29udGVudEJsb2Nr ZXI6ICJjb250ZW50LWJsb2NrZXIiLCBPdGhlcjogIm90aGVyIn0pOworSW5zcGVjdG9yQmFja2Vu ZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ29uc29sZU1lc3NhZ2VTb3VyY2UiLCB7WE1MOiAieG1s IiwgSmF2YVNjcmlwdDogImphdmFzY3JpcHQiLCBOZXR3b3JrOiAibmV0d29yayIsIENvbnNvbGVB UEk6ICJjb25zb2xlLWFwaSIsIFN0b3JhZ2U6ICJzdG9yYWdlIiwgQXBwY2FjaGU6ICJhcHBjYWNo ZSIsIFJlbmRlcmluZzogInJlbmRlcmluZyIsIENTUzogImNzcyIsIFNlY3VyaXR5OiAic2VjdXJp dHkiLCBDb250ZW50QmxvY2tlcjogImNvbnRlbnQtYmxvY2tlciIsIE90aGVyOiAib3RoZXIifSk7 CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiQ29uc29sZS5Db25zb2xlTWVzc2FnZUxl dmVsIiwge0xvZzogImxvZyIsIEluZm86ICJpbmZvIiwgV2FybmluZzogIndhcm5pbmciLCBFcnJv cjogImVycm9yIiwgRGVidWc6ICJkZWJ1ZyJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJF bnVtKCJDb25zb2xlLkNvbnNvbGVNZXNzYWdlVHlwZSIsIHtMb2c6ICJsb2ciLCBEaXI6ICJkaXIi LCBEaXJYTUw6ICJkaXJ4bWwiLCBUYWJsZTogInRhYmxlIiwgVHJhY2U6ICJ0cmFjZSIsIENsZWFy OiAiY2xlYXIiLCBTdGFydEdyb3VwOiAic3RhcnRHcm91cCIsIFN0YXJ0R3JvdXBDb2xsYXBzZWQ6 ICJzdGFydEdyb3VwQ29sbGFwc2VkIiwgRW5kR3JvdXA6ICJlbmRHcm91cCIsIEFzc2VydDogImFz c2VydCIsIFRpbWluZzogInRpbWluZyIsIFByb2ZpbGU6ICJwcm9maWxlIiwgUHJvZmlsZUVuZDog InByb2ZpbGVFbmQifSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRXZlbnQoIkNvbnNvbGUu bWVzc2FnZUFkZGVkIiwgWyJtZXNzYWdlIl0pOwpAQCAtMjcxLDcgKzI3MSw3IEBAIEluc3BlY3Rv ckJhY2tlbmQuYWN0aXZhdGVEb21haW4oIkxheWVyVHJlZSIsIFsid2ViIl0pOwogCiAvLyBNZW1v cnkuCiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyTWVtb3J5RGlzcGF0Y2hlciA9IEluc3BlY3Rv ckJhY2tlbmQucmVnaXN0ZXJEb21haW5EaXNwYXRjaGVyLmJpbmQoSW5zcGVjdG9yQmFja2VuZCwg Ik1lbW9yeSIpOwotSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIk1lbW9yeS5DYXRlZ29y eURhdGFUeXBlIiwge0phdmFzY3JpcHQ6ICJqYXZhc2NyaXB0IiwgSklUOiAiaml0IiwgSW1hZ2Vz OiAiaW1hZ2VzIiwgTGF5ZXJzOiAibGF5ZXJzIiwgUGFnZTogInBhZ2UiLCBPdGhlcjogIm90aGVy In0pOworSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIk1lbW9yeS5DYXRlZ29yeURhdGFU eXBlIiwge0phdmFTY3JpcHQ6ICJqYXZhc2NyaXB0IiwgSklUOiAiaml0IiwgSW1hZ2VzOiAiaW1h Z2VzIiwgTGF5ZXJzOiAibGF5ZXJzIiwgUGFnZTogInBhZ2UiLCBPdGhlcjogIm90aGVyIn0pOwog SW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIk1lbW9yeS5NZW1vcnlQcmVzc3VyZVNldmVy aXR5Iiwge0NyaXRpY2FsOiAiY3JpdGljYWwiLCBOb25Dcml0aWNhbDogIm5vbi1jcml0aWNhbCJ9 KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFdmVudCgiTWVtb3J5Lm1lbW9yeVByZXNzdXJl IiwgWyJ0aW1lc3RhbXAiLCAic2V2ZXJpdHkiXSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVy RXZlbnQoIk1lbW9yeS50cmFja2luZ1N0YXJ0IiwgWyJ0aW1lc3RhbXAiXSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvMTEu My9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvMTEuMy9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMu anMKaW5kZXggYWNmMWMwNWY1ZDcuLjM5NDI2MDZkN2M3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvMTEuMy9JbnNwZWN0b3JC YWNrZW5kQ29tbWFuZHMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvUHJvdG9jb2wvTGVnYWN5LzExLjMvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCkBAIC02 Nyw3ICs2Nyw3IEBAIEluc3BlY3RvckJhY2tlbmQuYWN0aXZhdGVEb21haW4oIkNTUyIsIFsid2Vi Il0pOwogCiAvLyBDYW52YXMuCiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ2FudmFzRGlzcGF0 Y2hlciA9IEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJEb21haW5EaXNwYXRjaGVyLmJpbmQoSW5z cGVjdG9yQmFja2VuZCwgIkNhbnZhcyIpOwotSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0o IkNhbnZhcy5Db250ZXh0VHlwZSIsIHtDYW52YXMyRDogImNhbnZhcy0yZCIsIEJpdG1hcFJlbmRl cmVyOiAiYml0bWFwcmVuZGVyZXIiLCBXZWJHTDogIndlYmdsIiwgV2ViR0wyOiAid2ViZ2wyIiwg V2ViR1BVOiAid2ViZ3B1In0pOworSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNhbnZh cy5Db250ZXh0VHlwZSIsIHtDYW52YXMyRDogImNhbnZhcy0yZCIsIEJpdG1hcFJlbmRlcmVyOiAi Yml0bWFwcmVuZGVyZXIiLCBXZWJHTDogIndlYmdsIiwgV2ViR0wyOiAid2ViZ2wyIiwgV2ViZ3B1 OiAid2ViZ3B1In0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNhbnZhcy5TaGFk ZXJUeXBlIiwge0ZyYWdtZW50OiAiZnJhZ21lbnQiLCBWZXJ0ZXg6ICJ2ZXJ0ZXgifSk7CiBJbnNw ZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRXZlbnQoIkNhbnZhcy5jYW52YXNBZGRlZCIsIFsiY2FudmFz Il0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2ZW50KCJDYW52YXMuY2FudmFzUmVtb3Zl ZCIsIFsiY2FudmFzSWQiXSk7CkBAIC05Myw3ICs5Myw3IEBAIEluc3BlY3RvckJhY2tlbmQuYWN0 aXZhdGVEb21haW4oIkNhbnZhcyIsIFsid2ViIl0pOwogCiAvLyBDb25zb2xlLgogSW5zcGVjdG9y QmFja2VuZC5yZWdpc3RlckNvbnNvbGVEaXNwYXRjaGVyID0gSW5zcGVjdG9yQmFja2VuZC5yZWdp c3RlckRvbWFpbkRpc3BhdGNoZXIuYmluZChJbnNwZWN0b3JCYWNrZW5kLCAiQ29uc29sZSIpOwot SW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ2hhbm5lbFNvdXJjZSIsIHtY TUw6ICJ4bWwiLCBKYXZhc2NyaXB0OiAiamF2YXNjcmlwdCIsIE5ldHdvcms6ICJuZXR3b3JrIiwg Q29uc29sZUFQSTogImNvbnNvbGUtYXBpIiwgU3RvcmFnZTogInN0b3JhZ2UiLCBBcHBjYWNoZTog ImFwcGNhY2hlIiwgUmVuZGVyaW5nOiAicmVuZGVyaW5nIiwgQ1NTOiAiY3NzIiwgU2VjdXJpdHk6 ICJzZWN1cml0eSIsIENvbnRlbnRCbG9ja2VyOiAiY29udGVudC1ibG9ja2VyIiwgTWVkaWE6ICJt ZWRpYSIsIFdlYlJUQzogIndlYnJ0YyIsIE90aGVyOiAib3RoZXIifSk7CitJbnNwZWN0b3JCYWNr ZW5kLnJlZ2lzdGVyRW51bSgiQ29uc29sZS5DaGFubmVsU291cmNlIiwge1hNTDogInhtbCIsIEph dmFTY3JpcHQ6ICJqYXZhc2NyaXB0IiwgTmV0d29yazogIm5ldHdvcmsiLCBDb25zb2xlQVBJOiAi Y29uc29sZS1hcGkiLCBTdG9yYWdlOiAic3RvcmFnZSIsIEFwcGNhY2hlOiAiYXBwY2FjaGUiLCBS ZW5kZXJpbmc6ICJyZW5kZXJpbmciLCBDU1M6ICJjc3MiLCBTZWN1cml0eTogInNlY3VyaXR5Iiwg Q29udGVudEJsb2NrZXI6ICJjb250ZW50LWJsb2NrZXIiLCBNZWRpYTogIm1lZGlhIiwgV2ViUlRD OiAid2VicnRjIiwgT3RoZXI6ICJvdGhlciJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJF bnVtKCJDb25zb2xlLkNoYW5uZWxMZXZlbCIsIHtPZmY6ICJvZmYiLCBCYXNpYzogImJhc2ljIiwg VmVyYm9zZTogInZlcmJvc2UifSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiQ29u c29sZS5Db25zb2xlTWVzc2FnZUxldmVsIiwge0xvZzogImxvZyIsIEluZm86ICJpbmZvIiwgV2Fy bmluZzogIndhcm5pbmciLCBFcnJvcjogImVycm9yIiwgRGVidWc6ICJkZWJ1ZyJ9KTsKIEluc3Bl Y3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJDb25zb2xlLkNvbnNvbGVNZXNzYWdlVHlwZSIsIHtM b2c6ICJsb2ciLCBEaXI6ICJkaXIiLCBEaXJYTUw6ICJkaXJ4bWwiLCBUYWJsZTogInRhYmxlIiwg VHJhY2U6ICJ0cmFjZSIsIENsZWFyOiAiY2xlYXIiLCBTdGFydEdyb3VwOiAic3RhcnRHcm91cCIs IFN0YXJ0R3JvdXBDb2xsYXBzZWQ6ICJzdGFydEdyb3VwQ29sbGFwc2VkIiwgRW5kR3JvdXA6ICJl bmRHcm91cCIsIEFzc2VydDogImFzc2VydCIsIFRpbWluZzogInRpbWluZyIsIFByb2ZpbGU6ICJw cm9maWxlIiwgUHJvZmlsZUVuZDogInByb2ZpbGVFbmQifSk7CkBAIC0yOTgsNyArMjk4LDcgQEAg SW5zcGVjdG9yQmFja2VuZC5hY3RpdmF0ZURvbWFpbigiTGF5ZXJUcmVlIiwgWyJ3ZWIiXSk7CiAK IC8vIE1lbW9yeS4KIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJNZW1vcnlEaXNwYXRjaGVyID0g SW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIuYmluZChJbnNwZWN0b3JC YWNrZW5kLCAiTWVtb3J5Iik7Ci1JbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiTWVtb3J5 LkNhdGVnb3J5RGF0YVR5cGUiLCB7SmF2YXNjcmlwdDogImphdmFzY3JpcHQiLCBKSVQ6ICJqaXQi LCBJbWFnZXM6ICJpbWFnZXMiLCBMYXllcnM6ICJsYXllcnMiLCBQYWdlOiAicGFnZSIsIE90aGVy OiAib3RoZXIifSk7CitJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiTWVtb3J5LkNhdGVn b3J5RGF0YVR5cGUiLCB7SmF2YVNjcmlwdDogImphdmFzY3JpcHQiLCBKSVQ6ICJqaXQiLCBJbWFn ZXM6ICJpbWFnZXMiLCBMYXllcnM6ICJsYXllcnMiLCBQYWdlOiAicGFnZSIsIE90aGVyOiAib3Ro ZXIifSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiTWVtb3J5Lk1lbW9yeVByZXNz dXJlU2V2ZXJpdHkiLCB7Q3JpdGljYWw6ICJjcml0aWNhbCIsIE5vbkNyaXRpY2FsOiAibm9uLWNy aXRpY2FsIn0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2ZW50KCJNZW1vcnkubWVtb3J5 UHJlc3N1cmUiLCBbInRpbWVzdGFtcCIsICJzZXZlcml0eSJdKTsKIEluc3BlY3RvckJhY2tlbmQu cmVnaXN0ZXJFdmVudCgiTWVtb3J5LnRyYWNraW5nU3RhcnQiLCBbInRpbWVzdGFtcCJdKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xl Z2FjeS8xMi4wL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS8xMi4wL0luc3BlY3RvckJhY2tlbmRD b21tYW5kcy5qcwppbmRleCAwMDBkZjg1MWY5ZC4uM2EwNDZjZjhiZmIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS8xMi4wL0lu c3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvMTIuMC9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMu anMKQEAgLTY3LDcgKzY3LDcgQEAgSW5zcGVjdG9yQmFja2VuZC5hY3RpdmF0ZURvbWFpbigiQ1NT IiwgWyJ3ZWIiXSk7CiAKIC8vIENhbnZhcy4KIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJDYW52 YXNEaXNwYXRjaGVyID0gSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIu YmluZChJbnNwZWN0b3JCYWNrZW5kLCAiQ2FudmFzIik7Ci1JbnNwZWN0b3JCYWNrZW5kLnJlZ2lz dGVyRW51bSgiQ2FudmFzLkNvbnRleHRUeXBlIiwge0NhbnZhczJEOiAiY2FudmFzLTJkIiwgQml0 bWFwUmVuZGVyZXI6ICJiaXRtYXByZW5kZXJlciIsIFdlYkdMOiAid2ViZ2wiLCBXZWJHTDI6ICJ3 ZWJnbDIiLCBXZWJHUFU6ICJ3ZWJncHUifSk7CitJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51 bSgiQ2FudmFzLkNvbnRleHRUeXBlIiwge0NhbnZhczJEOiAiY2FudmFzLTJkIiwgQml0bWFwUmVu ZGVyZXI6ICJiaXRtYXByZW5kZXJlciIsIFdlYkdMOiAid2ViZ2wiLCBXZWJHTDI6ICJ3ZWJnbDIi LCBXZWJncHU6ICJ3ZWJncHUifSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiQ2Fu dmFzLlNoYWRlclR5cGUiLCB7RnJhZ21lbnQ6ICJmcmFnbWVudCIsIFZlcnRleDogInZlcnRleCJ9 KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFdmVudCgiQ2FudmFzLmNhbnZhc0FkZGVkIiwg WyJjYW52YXMiXSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRXZlbnQoIkNhbnZhcy5jYW52 YXNSZW1vdmVkIiwgWyJjYW52YXNJZCJdKTsKQEAgLTk0LDcgKzk0LDcgQEAgSW5zcGVjdG9yQmFj a2VuZC5hY3RpdmF0ZURvbWFpbigiQ2FudmFzIiwgWyJ3ZWIiXSk7CiAKIC8vIENvbnNvbGUuCiBJ bnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29uc29sZURpc3BhdGNoZXIgPSBJbnNwZWN0b3JCYWNr ZW5kLnJlZ2lzdGVyRG9tYWluRGlzcGF0Y2hlci5iaW5kKEluc3BlY3RvckJhY2tlbmQsICJDb25z b2xlIik7Ci1JbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiQ29uc29sZS5DaGFubmVsU291 cmNlIiwge1hNTDogInhtbCIsIEphdmFzY3JpcHQ6ICJqYXZhc2NyaXB0IiwgTmV0d29yazogIm5l dHdvcmsiLCBDb25zb2xlQVBJOiAiY29uc29sZS1hcGkiLCBTdG9yYWdlOiAic3RvcmFnZSIsIEFw cGNhY2hlOiAiYXBwY2FjaGUiLCBSZW5kZXJpbmc6ICJyZW5kZXJpbmciLCBDU1M6ICJjc3MiLCBT ZWN1cml0eTogInNlY3VyaXR5IiwgQ29udGVudEJsb2NrZXI6ICJjb250ZW50LWJsb2NrZXIiLCBN ZWRpYTogIm1lZGlhIiwgV2ViUlRDOiAid2VicnRjIiwgT3RoZXI6ICJvdGhlciJ9KTsKK0luc3Bl Y3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJDb25zb2xlLkNoYW5uZWxTb3VyY2UiLCB7WE1MOiAi eG1sIiwgSmF2YVNjcmlwdDogImphdmFzY3JpcHQiLCBOZXR3b3JrOiAibmV0d29yayIsIENvbnNv bGVBUEk6ICJjb25zb2xlLWFwaSIsIFN0b3JhZ2U6ICJzdG9yYWdlIiwgQXBwY2FjaGU6ICJhcHBj YWNoZSIsIFJlbmRlcmluZzogInJlbmRlcmluZyIsIENTUzogImNzcyIsIFNlY3VyaXR5OiAic2Vj dXJpdHkiLCBDb250ZW50QmxvY2tlcjogImNvbnRlbnQtYmxvY2tlciIsIE1lZGlhOiAibWVkaWEi LCBXZWJSVEM6ICJ3ZWJydGMiLCBPdGhlcjogIm90aGVyIn0pOwogSW5zcGVjdG9yQmFja2VuZC5y ZWdpc3RlckVudW0oIkNvbnNvbGUuQ2hhbm5lbExldmVsIiwge09mZjogIm9mZiIsIEJhc2ljOiAi YmFzaWMiLCBWZXJib3NlOiAidmVyYm9zZSJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJF bnVtKCJDb25zb2xlLkNvbnNvbGVNZXNzYWdlTGV2ZWwiLCB7TG9nOiAibG9nIiwgSW5mbzogImlu Zm8iLCBXYXJuaW5nOiAid2FybmluZyIsIEVycm9yOiAiZXJyb3IiLCBEZWJ1ZzogImRlYnVnIn0p OwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ29uc29sZU1lc3NhZ2VU eXBlIiwge0xvZzogImxvZyIsIERpcjogImRpciIsIERpclhNTDogImRpcnhtbCIsIFRhYmxlOiAi dGFibGUiLCBUcmFjZTogInRyYWNlIiwgQ2xlYXI6ICJjbGVhciIsIFN0YXJ0R3JvdXA6ICJzdGFy dEdyb3VwIiwgU3RhcnRHcm91cENvbGxhcHNlZDogInN0YXJ0R3JvdXBDb2xsYXBzZWQiLCBFbmRH cm91cDogImVuZEdyb3VwIiwgQXNzZXJ0OiAiYXNzZXJ0IiwgVGltaW5nOiAidGltaW5nIiwgUHJv ZmlsZTogInByb2ZpbGUiLCBQcm9maWxlRW5kOiAicHJvZmlsZUVuZCJ9KTsKQEAgLTMwMCw3ICsz MDAsNyBAQCBJbnNwZWN0b3JCYWNrZW5kLmFjdGl2YXRlRG9tYWluKCJMYXllclRyZWUiLCBbIndl YiJdKTsKIAogLy8gTWVtb3J5LgogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3Rlck1lbW9yeURpc3Bh dGNoZXIgPSBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRG9tYWluRGlzcGF0Y2hlci5iaW5kKElu c3BlY3RvckJhY2tlbmQsICJNZW1vcnkiKTsKLUluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVt KCJNZW1vcnkuQ2F0ZWdvcnlEYXRhVHlwZSIsIHtKYXZhc2NyaXB0OiAiamF2YXNjcmlwdCIsIEpJ VDogImppdCIsIEltYWdlczogImltYWdlcyIsIExheWVyczogImxheWVycyIsIFBhZ2U6ICJwYWdl IiwgT3RoZXI6ICJvdGhlciJ9KTsKK0luc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJNZW1v cnkuQ2F0ZWdvcnlEYXRhVHlwZSIsIHtKYXZhU2NyaXB0OiAiamF2YXNjcmlwdCIsIEpJVDogImpp dCIsIEltYWdlczogImltYWdlcyIsIExheWVyczogImxheWVycyIsIFBhZ2U6ICJwYWdlIiwgT3Ro ZXI6ICJvdGhlciJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJNZW1vcnkuTWVt b3J5UHJlc3N1cmVTZXZlcml0eSIsIHtDcml0aWNhbDogImNyaXRpY2FsIiwgTm9uQ3JpdGljYWw6 ICJub24tY3JpdGljYWwifSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRXZlbnQoIk1lbW9y eS5tZW1vcnlQcmVzc3VyZSIsIFsidGltZXN0YW1wIiwgInNldmVyaXR5Il0pOwogSW5zcGVjdG9y QmFja2VuZC5yZWdpc3RlckV2ZW50KCJNZW1vcnkudHJhY2tpbmdTdGFydCIsIFsidGltZXN0YW1w Il0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJv dG9jb2wvTGVnYWN5LzguMC9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvOC4wL0luc3BlY3RvckJh Y2tlbmRDb21tYW5kcy5qcwppbmRleCBmMjg4Mjc2NTZhYi4uNTk0MzdkZWJmMDYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS84 LjAvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS84LjAvSW5zcGVjdG9yQmFja2VuZENvbW1h bmRzLmpzCkBAIC0zMCw3ICszMCw3IEBACiAKIC8vIENvbnNvbGUuCiBJbnNwZWN0b3JCYWNrZW5k LnJlZ2lzdGVyQ29uc29sZURpc3BhdGNoZXIgPSBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRG9t YWluRGlzcGF0Y2hlci5iaW5kKEluc3BlY3RvckJhY2tlbmQsICJDb25zb2xlIik7Ci1JbnNwZWN0 b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiQ29uc29sZS5Db25zb2xlTWVzc2FnZVNvdXJjZSIsIHtY TUw6ICJ4bWwiLCBKYXZhc2NyaXB0OiAiamF2YXNjcmlwdCIsIE5ldHdvcms6ICJuZXR3b3JrIiwg Q29uc29sZUFQSTogImNvbnNvbGUtYXBpIiwgU3RvcmFnZTogInN0b3JhZ2UiLCBBcHBjYWNoZTog ImFwcGNhY2hlIiwgUmVuZGVyaW5nOiAicmVuZGVyaW5nIiwgQ1NTOiAiY3NzIiwgU2VjdXJpdHk6 ICJzZWN1cml0eSIsIE90aGVyOiAib3RoZXIifSk7CitJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVy RW51bSgiQ29uc29sZS5Db25zb2xlTWVzc2FnZVNvdXJjZSIsIHtYTUw6ICJ4bWwiLCBKYXZhU2Ny aXB0OiAiamF2YXNjcmlwdCIsIE5ldHdvcms6ICJuZXR3b3JrIiwgQ29uc29sZUFQSTogImNvbnNv bGUtYXBpIiwgU3RvcmFnZTogInN0b3JhZ2UiLCBBcHBjYWNoZTogImFwcGNhY2hlIiwgUmVuZGVy aW5nOiAicmVuZGVyaW5nIiwgQ1NTOiAiY3NzIiwgU2VjdXJpdHk6ICJzZWN1cml0eSIsIE90aGVy OiAib3RoZXIifSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiQ29uc29sZS5Db25z b2xlTWVzc2FnZUxldmVsIiwge0xvZzogImxvZyIsIFdhcm5pbmc6ICJ3YXJuaW5nIiwgRXJyb3I6 ICJlcnJvciIsIERlYnVnOiAiZGVidWcifSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51 bSgiQ29uc29sZS5Db25zb2xlTWVzc2FnZVR5cGUiLCB7TG9nOiAibG9nIiwgRGlyOiAiZGlyIiwg RGlyWE1MOiAiZGlyeG1sIiwgVGFibGU6ICJ0YWJsZSIsIFRyYWNlOiAidHJhY2UiLCBDbGVhcjog ImNsZWFyIiwgU3RhcnRHcm91cDogInN0YXJ0R3JvdXAiLCBTdGFydEdyb3VwQ29sbGFwc2VkOiAi c3RhcnRHcm91cENvbGxhcHNlZCIsIEVuZEdyb3VwOiAiZW5kR3JvdXAiLCBBc3NlcnQ6ICJhc3Nl cnQiLCBUaW1pbmc6ICJ0aW1pbmciLCBQcm9maWxlOiAicHJvZmlsZSIsIFByb2ZpbGVFbmQ6ICJw cm9maWxlRW5kIn0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2ZW50KCJDb25zb2xlLm1l c3NhZ2VBZGRlZCIsIFsibWVzc2FnZSJdKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS85LjAvSW5zcGVjdG9yQmFja2VuZENv bW1hbmRzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wv TGVnYWN5LzkuMC9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMKaW5kZXggNGFlODI4ODIyNTAu LmE4ZjhkNWY4ZDNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Qcm90b2NvbC9MZWdhY3kvOS4wL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvOS4w L0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcwpAQCAtNzAsNyArNzAsNyBAQCBJbnNwZWN0b3JC YWNrZW5kLmFjdGl2YXRlRG9tYWluKCJDU1MiLCBbIndlYiJdKTsKIAogLy8gQ29uc29sZS4KIElu c3BlY3RvckJhY2tlbmQucmVnaXN0ZXJDb25zb2xlRGlzcGF0Y2hlciA9IEluc3BlY3RvckJhY2tl bmQucmVnaXN0ZXJEb21haW5EaXNwYXRjaGVyLmJpbmQoSW5zcGVjdG9yQmFja2VuZCwgIkNvbnNv bGUiKTsKLUluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJDb25zb2xlLkNvbnNvbGVNZXNz YWdlU291cmNlIiwge1hNTDogInhtbCIsIEphdmFzY3JpcHQ6ICJqYXZhc2NyaXB0IiwgTmV0d29y azogIm5ldHdvcmsiLCBDb25zb2xlQVBJOiAiY29uc29sZS1hcGkiLCBTdG9yYWdlOiAic3RvcmFn ZSIsIEFwcGNhY2hlOiAiYXBwY2FjaGUiLCBSZW5kZXJpbmc6ICJyZW5kZXJpbmciLCBDU1M6ICJj c3MiLCBTZWN1cml0eTogInNlY3VyaXR5IiwgQ29udGVudEJsb2NrZXI6ICJjb250ZW50LWJsb2Nr ZXIiLCBPdGhlcjogIm90aGVyIn0pOworSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNv bnNvbGUuQ29uc29sZU1lc3NhZ2VTb3VyY2UiLCB7WE1MOiAieG1sIiwgSmF2YVNjcmlwdDogImph dmFzY3JpcHQiLCBOZXR3b3JrOiAibmV0d29yayIsIENvbnNvbGVBUEk6ICJjb25zb2xlLWFwaSIs IFN0b3JhZ2U6ICJzdG9yYWdlIiwgQXBwY2FjaGU6ICJhcHBjYWNoZSIsIFJlbmRlcmluZzogInJl bmRlcmluZyIsIENTUzogImNzcyIsIFNlY3VyaXR5OiAic2VjdXJpdHkiLCBDb250ZW50QmxvY2tl cjogImNvbnRlbnQtYmxvY2tlciIsIE90aGVyOiAib3RoZXIifSk7CiBJbnNwZWN0b3JCYWNrZW5k LnJlZ2lzdGVyRW51bSgiQ29uc29sZS5Db25zb2xlTWVzc2FnZUxldmVsIiwge0xvZzogImxvZyIs IEluZm86ICJpbmZvIiwgV2FybmluZzogIndhcm5pbmciLCBFcnJvcjogImVycm9yIiwgRGVidWc6 ICJkZWJ1ZyJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJDb25zb2xlLkNvbnNv bGVNZXNzYWdlVHlwZSIsIHtMb2c6ICJsb2ciLCBEaXI6ICJkaXIiLCBEaXJYTUw6ICJkaXJ4bWwi LCBUYWJsZTogInRhYmxlIiwgVHJhY2U6ICJ0cmFjZSIsIENsZWFyOiAiY2xlYXIiLCBTdGFydEdy b3VwOiAic3RhcnRHcm91cCIsIFN0YXJ0R3JvdXBDb2xsYXBzZWQ6ICJzdGFydEdyb3VwQ29sbGFw c2VkIiwgRW5kR3JvdXA6ICJlbmRHcm91cCIsIEFzc2VydDogImFzc2VydCIsIFRpbWluZzogInRp bWluZyIsIFByb2ZpbGU6ICJwcm9maWxlIiwgUHJvZmlsZUVuZDogInByb2ZpbGVFbmQifSk7CiBJ bnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRXZlbnQoIkNvbnNvbGUubWVzc2FnZUFkZGVkIiwgWyJt ZXNzYWdlIl0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvUHJvdG9jb2wvTGVnYWN5LzkuMy9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvOS4zL0luc3Bl Y3RvckJhY2tlbmRDb21tYW5kcy5qcwppbmRleCA4NWFkZDc5MTY1Mi4uYTQ2N2YwYzk1MWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xl Z2FjeS85LjMvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS85LjMvSW5zcGVjdG9yQmFja2Vu ZENvbW1hbmRzLmpzCkBAIC03NCw3ICs3NCw3IEBAIEluc3BlY3RvckJhY2tlbmQuYWN0aXZhdGVE b21haW4oIkNTUyIsIFsid2ViIl0pOwogCiAvLyBDb25zb2xlLgogSW5zcGVjdG9yQmFja2VuZC5y ZWdpc3RlckNvbnNvbGVEaXNwYXRjaGVyID0gSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckRvbWFp bkRpc3BhdGNoZXIuYmluZChJbnNwZWN0b3JCYWNrZW5kLCAiQ29uc29sZSIpOwotSW5zcGVjdG9y QmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ29uc29sZU1lc3NhZ2VTb3VyY2UiLCB7WE1M OiAieG1sIiwgSmF2YXNjcmlwdDogImphdmFzY3JpcHQiLCBOZXR3b3JrOiAibmV0d29yayIsIENv bnNvbGVBUEk6ICJjb25zb2xlLWFwaSIsIFN0b3JhZ2U6ICJzdG9yYWdlIiwgQXBwY2FjaGU6ICJh cHBjYWNoZSIsIFJlbmRlcmluZzogInJlbmRlcmluZyIsIENTUzogImNzcyIsIFNlY3VyaXR5OiAi c2VjdXJpdHkiLCBDb250ZW50QmxvY2tlcjogImNvbnRlbnQtYmxvY2tlciIsIE90aGVyOiAib3Ro ZXIifSk7CitJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiQ29uc29sZS5Db25zb2xlTWVz c2FnZVNvdXJjZSIsIHtYTUw6ICJ4bWwiLCBKYXZhU2NyaXB0OiAiamF2YXNjcmlwdCIsIE5ldHdv cms6ICJuZXR3b3JrIiwgQ29uc29sZUFQSTogImNvbnNvbGUtYXBpIiwgU3RvcmFnZTogInN0b3Jh Z2UiLCBBcHBjYWNoZTogImFwcGNhY2hlIiwgUmVuZGVyaW5nOiAicmVuZGVyaW5nIiwgQ1NTOiAi Y3NzIiwgU2VjdXJpdHk6ICJzZWN1cml0eSIsIENvbnRlbnRCbG9ja2VyOiAiY29udGVudC1ibG9j a2VyIiwgT3RoZXI6ICJvdGhlciJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJD b25zb2xlLkNvbnNvbGVNZXNzYWdlTGV2ZWwiLCB7TG9nOiAibG9nIiwgSW5mbzogImluZm8iLCBX YXJuaW5nOiAid2FybmluZyIsIEVycm9yOiAiZXJyb3IiLCBEZWJ1ZzogImRlYnVnIn0pOwogSW5z cGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ29uc29sZU1lc3NhZ2VUeXBlIiwg e0xvZzogImxvZyIsIERpcjogImRpciIsIERpclhNTDogImRpcnhtbCIsIFRhYmxlOiAidGFibGUi LCBUcmFjZTogInRyYWNlIiwgQ2xlYXI6ICJjbGVhciIsIFN0YXJ0R3JvdXA6ICJzdGFydEdyb3Vw IiwgU3RhcnRHcm91cENvbGxhcHNlZDogInN0YXJ0R3JvdXBDb2xsYXBzZWQiLCBFbmRHcm91cDog ImVuZEdyb3VwIiwgQXNzZXJ0OiAiYXNzZXJ0IiwgVGltaW5nOiAidGltaW5nIiwgUHJvZmlsZTog InByb2ZpbGUiLCBQcm9maWxlRW5kOiAicHJvZmlsZUVuZCJ9KTsKIEluc3BlY3RvckJhY2tlbmQu cmVnaXN0ZXJFdmVudCgiQ29uc29sZS5tZXNzYWdlQWRkZWQiLCBbIm1lc3NhZ2UiXSk7Cg== 354049 2018-11-06 19:01:25 -0800 2018-11-07 11:48:13 -0800 [PATCH] Proposed Fix js-enum-2.patch text/plain 26567 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDY3ZTQ4NTk0ZmE5Li4zNDI3NmI3NWU4MSAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTgtMTEtMDYgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBGaXggIkphdmFzY3JpcHQiID0+ICJKYXZhU2NyaXB0IiBlbnVtIGluIHByb3RvY29sIGdlbmVy YXRlZCBvYmplY3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTEzNDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGluc3BlY3Rvci9Db25zb2xlTWVzc2FnZS5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6 Om1lc3NhZ2VTb3VyY2VWYWx1ZSk6CisgICAgICAgIFVzZSBuZXcgZW51bSBuYW1lLgorCisgICAg ICAgICogaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0b3IucHk6CisgICAgICAgIENv cnJlY3QgdGhlIGNhc2luZyBvZiAiSmF2YVNjcmlwdCIuCisKIDIwMTgtMTEtMDUgIERvbiBPbG1z dGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAgICAgICBGaXggdHlwb3MgaW4gY2xv c2luZyBFTkFCTEUgZ3VhcmRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5z cGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvQ29uc29sZU1lc3NhZ2UuY3BwCmluZGV4IGE1ZGUwNjVjYmRjLi43MTZhYzQ0MWI3YyAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9Db25zb2xlTWVzc2FnZS5j cHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9Db25zb2xlTWVzc2FnZS5j cHAKQEAgLTE1OCw3ICsxNTgsNyBAQCBzdGF0aWMgUHJvdG9jb2w6OkNvbnNvbGU6OkNoYW5uZWxT b3VyY2UgbWVzc2FnZVNvdXJjZVZhbHVlKE1lc3NhZ2VTb3VyY2Ugc291cmNlKQogewogICAgIHN3 aXRjaCAoc291cmNlKSB7CiAgICAgY2FzZSBNZXNzYWdlU291cmNlOjpYTUw6IHJldHVybiBQcm90 b2NvbDo6Q29uc29sZTo6Q2hhbm5lbFNvdXJjZTo6WE1MOwotICAgIGNhc2UgTWVzc2FnZVNvdXJj ZTo6SlM6IHJldHVybiBQcm90b2NvbDo6Q29uc29sZTo6Q2hhbm5lbFNvdXJjZTo6SmF2YXNjcmlw dDsKKyAgICBjYXNlIE1lc3NhZ2VTb3VyY2U6OkpTOiByZXR1cm4gUHJvdG9jb2w6OkNvbnNvbGU6 OkNoYW5uZWxTb3VyY2U6OkphdmFTY3JpcHQ7CiAgICAgY2FzZSBNZXNzYWdlU291cmNlOjpOZXR3 b3JrOiByZXR1cm4gUHJvdG9jb2w6OkNvbnNvbGU6OkNoYW5uZWxTb3VyY2U6Ok5ldHdvcms7CiAg ICAgY2FzZSBNZXNzYWdlU291cmNlOjpDb25zb2xlQVBJOiByZXR1cm4gUHJvdG9jb2w6OkNvbnNv bGU6OkNoYW5uZWxTb3VyY2U6OkNvbnNvbGVBUEk7CiAgICAgY2FzZSBNZXNzYWdlU291cmNlOjpT dG9yYWdlOiByZXR1cm4gUHJvdG9jb2w6OkNvbnNvbGU6OkNoYW5uZWxTb3VyY2U6OlN0b3JhZ2U7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29k ZWdlbi9nZW5lcmF0b3IucHkgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Njcmlw dHMvY29kZWdlbi9nZW5lcmF0b3IucHkKaW5kZXggMzhhNTk3OTJhMDQuLmRkZGJlMjZhMDI5IDEw MDc1NQotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdl bi9nZW5lcmF0b3IucHkKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3Jp cHRzL2NvZGVnZW4vZ2VuZXJhdG9yLnB5CkBAIC00Miw3ICs0Miw3IEBAIGxvZyA9IGxvZ2dpbmcu Z2V0TG9nZ2VyKCdnbG9iYWwnKQogZGVmIHVjZmlyc3Qoc3RyKToKICAgICByZXR1cm4gc3RyWzox XS51cHBlcigpICsgc3RyWzE6XQogCi1fQUxXQVlTX1NQRUNJQUxDQVNFRF9FTlVNX1ZBTFVFX1NV QlNUUklOR1MgPSBzZXQoWycyRCcsICdBUEknLCAnQ1NTJywgJ0RPTScsICdIVE1MJywgJ0pJVCcs ICdYSFInLCAnWE1MJywgJ0lPUycsICdNYWNPUyddKQorX0FMV0FZU19TUEVDSUFMQ0FTRURfRU5V TV9WQUxVRV9TVUJTVFJJTkdTID0gc2V0KFsnMkQnLCAnQVBJJywgJ0NTUycsICdET00nLCAnSFRN TCcsICdKSVQnLCAnWEhSJywgJ1hNTCcsICdJT1MnLCAnTWFjT1MnLCAnSmF2YVNjcmlwdCddKQog X0FMV0FZU19TUEVDSUFMQ0FTRURfRU5VTV9WQUxVRV9MT09LVVBfVEFCTEUgPSBkaWN0KFsocy51 cHBlcigpLCBzKSBmb3IgcyBpbiBfQUxXQVlTX1NQRUNJQUxDQVNFRF9FTlVNX1ZBTFVFX1NVQlNU UklOR1NdKQogCiBfRU5VTV9JREVOVElGSUVSX1JFTkFNRV9NQVAgPSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWI2OTRkYTFiZGIuLmFjOGRjYzNjY2JjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIw MTgtMTEtMDYgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAg ICBXZWIgSW5zcGVjdG9yOiBGaXggIkphdmFzY3JpcHQiID0+ICJKYXZhU2NyaXB0IiBlbnVtIGlu IHByb3RvY29sIGdlbmVyYXRlZCBvYmplY3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTEzNDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yTWVtb3J5QWdl bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yTWVtb3J5QWdlbnQ6OmNvbGxlY3RT YW1wbGUpOgorICAgICAgICBVc2UgbmV3IGVudW0gbmFtZS4KKwogMjAxOC0xMS0wNSAgTXlsZXMg Qy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFBhcnNpbmcgc3Vw cG9ydCBmb3IgdGV4dC11bmRlcmxpbmUtb2Zmc2V0IGFuZCB0ZXh0LWRlY29yYXRpb24tdGhpY2tu ZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rv ck1lbW9yeUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVj dG9yTWVtb3J5QWdlbnQuY3BwCmluZGV4IDYzMGJlODgyNDljLi43NjhhNmRhOTE4YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JNZW1vcnlBZ2Vu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JNZW1v cnlBZ2VudC5jcHAKQEAgLTEwNyw3ICsxMDcsNyBAQCB2b2lkIEluc3BlY3Rvck1lbW9yeUFnZW50 OjpkaWRIYW5kbGVNZW1vcnlQcmVzc3VyZShDcml0aWNhbCBjcml0aWNhbCkKIHZvaWQgSW5zcGVj dG9yTWVtb3J5QWdlbnQ6OmNvbGxlY3RTYW1wbGUoY29uc3QgUmVzb3VyY2VVc2FnZURhdGEmIGRh dGEpCiB7CiAgICAgYXV0byBqYXZhc2NyaXB0Q2F0ZWdvcnkgPSBQcm90b2NvbDo6TWVtb3J5OjpD YXRlZ29yeURhdGE6OmNyZWF0ZSgpCi0gICAgICAgIC5zZXRUeXBlKFByb3RvY29sOjpNZW1vcnk6 OkNhdGVnb3J5RGF0YTo6VHlwZTo6SmF2YXNjcmlwdCkKKyAgICAgICAgLnNldFR5cGUoUHJvdG9j b2w6Ok1lbW9yeTo6Q2F0ZWdvcnlEYXRhOjpUeXBlOjpKYXZhU2NyaXB0KQogICAgICAgICAuc2V0 U2l6ZShkYXRhLmNhdGVnb3JpZXNbTWVtb3J5Q2F0ZWdvcnk6OkdDSGVhcF0udG90YWxTaXplKCkg KyBkYXRhLmNhdGVnb3JpZXNbTWVtb3J5Q2F0ZWdvcnk6OkdDT3duZWRdLnRvdGFsU2l6ZSgpKQog ICAgICAgICAucmVsZWFzZSgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv Q2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA0MTExYTYw YmUxNS4uMzZmMjkwNmQzOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDE4LTExLTA2ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisK KyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4ICJKYXZhc2NyaXB0IiA9PiAiSmF2YVNjcmlwdCIg ZW51bSBpbiBwcm90b2NvbCBnZW5lcmF0ZWQgb2JqZWN0cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMzQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9DYW52YXMu anM6CisgICAgICAgIChXSS5DYW52YXMuZnJvbVBheWxvYWQpOgorICAgICAgICBJbnNlcnQgYSBt aXNzaW5nIGJyZWFrIHN0YXRlbWVudCBmb3IgdGhlIFdlYkdQVSBjYXNlLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9Nb2RlbHMvTWVtb3J5VGltZWxpbmVSZWNvcmQuanM6CisgICAgICAgIChX SS5NZW1vcnlUaW1lbGluZVJlY29yZC5tZW1vcnlDYXRlZ29yaWVzRnJvbVByb3RvY29sKToKKyAg ICAgICAgVXNlIG5ldyBlbnVtIG5hbWUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Byb3Rv Y29sL0xlZ2FjeS8xMC4wL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qczoKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS8xMC4zL0luc3BlY3RvckJhY2tlbmRDb21tYW5k cy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS8xMS4wL0luc3Bl Y3RvckJhY2tlbmRDb21tYW5kcy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Byb3RvY29s L0xlZ2FjeS8xMS4zL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qczoKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS8xMi4wL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5q czoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS84LjAvSW5zcGVjdG9y QmFja2VuZENvbW1hbmRzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVn YWN5LzkuMC9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanM6CisgICAgICAgICogVXNlckludGVy ZmFjZS9Qcm90b2NvbC9MZWdhY3kvOS4zL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qczoKKyAg ICAgICAgVXBkYXRlIGVudW1zIHdpdGggbmV3IGdlbmVyYXRvci4KKwogMjAxOC0xMS0wNiAgSm9z ZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IERlYnVnZ2VyIFBvcG92ZXIgZG9lcyBub3Qgd29yayB3aGVuIHBhdXNlZCBpbiBXb3JrZXIK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9D YW52YXMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ2Fu dmFzLmpzCmluZGV4IDVjMDFmYjZmOTE2Li41NmMyNjFjOWM0MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NhbnZhcy5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ2FudmFzLmpzCkBAIC03NCw2 ICs3NCw3IEBAIFdJLkNhbnZhcyA9IGNsYXNzIENhbnZhcyBleHRlbmRzIFdJLk9iamVjdAogICAg ICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQ2FudmFzQWdlbnQuQ29udGV4dFR5cGUuV2Vi R1BVOgogICAgICAgICAgICAgY29udGV4dFR5cGUgPSBXSS5DYW52YXMuQ29udGV4dFR5cGUuV2Vi R1BVOworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQ2FudmFzQWdlbnQuQ29udGV4 dFR5cGUuV2ViTWV0YWw6CiAgICAgICAgICAgICBjb250ZXh0VHlwZSA9IFdJLkNhbnZhcy5Db250 ZXh0VHlwZS5XZWJNZXRhbDsKICAgICAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL01lbW9yeVRpbWVsaW5lUmVjb3Jk LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL01lbW9yeVRp bWVsaW5lUmVjb3JkLmpzCmluZGV4IDBhM2Q0YjQ2MGNjLi42Mzk1ODE3NWRjMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL01lbW9yeVRpbWVs aW5lUmVjb3JkLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01v ZGVscy9NZW1vcnlUaW1lbGluZVJlY29yZC5qcwpAQCAtNTEsNyArNTEsNyBAQCBXSS5NZW1vcnlU aW1lbGluZVJlY29yZCA9IGNsYXNzIE1lbW9yeVRpbWVsaW5lUmVjb3JkIGV4dGVuZHMgV0kuVGlt ZWxpbmVSZWNvcmQKIAogICAgICAgICBmb3IgKGxldCB7dHlwZSwgc2l6ZX0gb2YgY2F0ZWdvcmll cykgewogICAgICAgICAgICAgc3dpdGNoICh0eXBlKSB7Ci0gICAgICAgICAgICBjYXNlIE1lbW9y eUFnZW50LkNhdGVnb3J5RGF0YVR5cGUuSmF2YXNjcmlwdDoKKyAgICAgICAgICAgIGNhc2UgTWVt b3J5QWdlbnQuQ2F0ZWdvcnlEYXRhVHlwZS5KYXZhU2NyaXB0OgogICAgICAgICAgICAgY2FzZSBN ZW1vcnlBZ2VudC5DYXRlZ29yeURhdGFUeXBlLkpJVDoKICAgICAgICAgICAgICAgICBqYXZhc2Ny aXB0U2l6ZSArPSBzaXplOwogICAgICAgICAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzEwLjAvSW5z cGVjdG9yQmFja2VuZENvbW1hbmRzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvUHJvdG9jb2wvTGVnYWN5LzEwLjAvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCmlu ZGV4IDgzY2Y4MzU3MmNjLi44ZGNjODE1MmJhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzEwLjAvSW5zcGVjdG9yQmFja2Vu ZENvbW1hbmRzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1By b3RvY29sL0xlZ2FjeS8xMC4wL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcwpAQCAtNzQsNyAr NzQsNyBAQCBJbnNwZWN0b3JCYWNrZW5kLmFjdGl2YXRlRG9tYWluKCJDU1MiLCBbIndlYiJdKTsK IAogLy8gQ29uc29sZS4KIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJDb25zb2xlRGlzcGF0Y2hl ciA9IEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJEb21haW5EaXNwYXRjaGVyLmJpbmQoSW5zcGVj dG9yQmFja2VuZCwgIkNvbnNvbGUiKTsKLUluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJD b25zb2xlLkNvbnNvbGVNZXNzYWdlU291cmNlIiwge1hNTDogInhtbCIsIEphdmFzY3JpcHQ6ICJq YXZhc2NyaXB0IiwgTmV0d29yazogIm5ldHdvcmsiLCBDb25zb2xlQVBJOiAiY29uc29sZS1hcGki LCBTdG9yYWdlOiAic3RvcmFnZSIsIEFwcGNhY2hlOiAiYXBwY2FjaGUiLCBSZW5kZXJpbmc6ICJy ZW5kZXJpbmciLCBDU1M6ICJjc3MiLCBTZWN1cml0eTogInNlY3VyaXR5IiwgQ29udGVudEJsb2Nr ZXI6ICJjb250ZW50LWJsb2NrZXIiLCBPdGhlcjogIm90aGVyIn0pOworSW5zcGVjdG9yQmFja2Vu ZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ29uc29sZU1lc3NhZ2VTb3VyY2UiLCB7WE1MOiAieG1s IiwgSmF2YVNjcmlwdDogImphdmFzY3JpcHQiLCBOZXR3b3JrOiAibmV0d29yayIsIENvbnNvbGVB UEk6ICJjb25zb2xlLWFwaSIsIFN0b3JhZ2U6ICJzdG9yYWdlIiwgQXBwY2FjaGU6ICJhcHBjYWNo ZSIsIFJlbmRlcmluZzogInJlbmRlcmluZyIsIENTUzogImNzcyIsIFNlY3VyaXR5OiAic2VjdXJp dHkiLCBDb250ZW50QmxvY2tlcjogImNvbnRlbnQtYmxvY2tlciIsIE90aGVyOiAib3RoZXIifSk7 CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiQ29uc29sZS5Db25zb2xlTWVzc2FnZUxl dmVsIiwge0xvZzogImxvZyIsIEluZm86ICJpbmZvIiwgV2FybmluZzogIndhcm5pbmciLCBFcnJv cjogImVycm9yIiwgRGVidWc6ICJkZWJ1ZyJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJF bnVtKCJDb25zb2xlLkNvbnNvbGVNZXNzYWdlVHlwZSIsIHtMb2c6ICJsb2ciLCBEaXI6ICJkaXIi LCBEaXJYTUw6ICJkaXJ4bWwiLCBUYWJsZTogInRhYmxlIiwgVHJhY2U6ICJ0cmFjZSIsIENsZWFy OiAiY2xlYXIiLCBTdGFydEdyb3VwOiAic3RhcnRHcm91cCIsIFN0YXJ0R3JvdXBDb2xsYXBzZWQ6 ICJzdGFydEdyb3VwQ29sbGFwc2VkIiwgRW5kR3JvdXA6ICJlbmRHcm91cCIsIEFzc2VydDogImFz c2VydCIsIFRpbWluZzogInRpbWluZyIsIFByb2ZpbGU6ICJwcm9maWxlIiwgUHJvZmlsZUVuZDog InByb2ZpbGVFbmQifSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRXZlbnQoIkNvbnNvbGUu bWVzc2FnZUFkZGVkIiwgWyJtZXNzYWdlIl0pOwpAQCAtMjUxLDcgKzI1MSw3IEBAIEluc3BlY3Rv ckJhY2tlbmQuYWN0aXZhdGVEb21haW4oIkxheWVyVHJlZSIsIFsid2ViIl0pOwogCiAvLyBNZW1v cnkuCiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyTWVtb3J5RGlzcGF0Y2hlciA9IEluc3BlY3Rv ckJhY2tlbmQucmVnaXN0ZXJEb21haW5EaXNwYXRjaGVyLmJpbmQoSW5zcGVjdG9yQmFja2VuZCwg Ik1lbW9yeSIpOwotSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIk1lbW9yeS5DYXRlZ29y eURhdGFUeXBlIiwge0phdmFzY3JpcHQ6ICJqYXZhc2NyaXB0IiwgSklUOiAiaml0IiwgSW1hZ2Vz OiAiaW1hZ2VzIiwgTGF5ZXJzOiAibGF5ZXJzIiwgUGFnZTogInBhZ2UiLCBPdGhlcjogIm90aGVy In0pOworSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIk1lbW9yeS5DYXRlZ29yeURhdGFU eXBlIiwge0phdmFTY3JpcHQ6ICJqYXZhc2NyaXB0IiwgSklUOiAiaml0IiwgSW1hZ2VzOiAiaW1h Z2VzIiwgTGF5ZXJzOiAibGF5ZXJzIiwgUGFnZTogInBhZ2UiLCBPdGhlcjogIm90aGVyIn0pOwog SW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIk1lbW9yeS5NZW1vcnlQcmVzc3VyZVNldmVy aXR5Iiwge0NyaXRpY2FsOiAiY3JpdGljYWwiLCBOb25Dcml0aWNhbDogIm5vbi1jcml0aWNhbCJ9 KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFdmVudCgiTWVtb3J5Lm1lbW9yeVByZXNzdXJl IiwgWyJ0aW1lc3RhbXAiLCAic2V2ZXJpdHkiXSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVy RXZlbnQoIk1lbW9yeS50cmFja2luZ1N0YXJ0IiwgWyJ0aW1lc3RhbXAiXSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvMTAu My9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvMTAuMy9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMu anMKaW5kZXggNjU1Y2RhYjZlOGQuLjcyODE1N2U0MzE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvMTAuMy9JbnNwZWN0b3JC YWNrZW5kQ29tbWFuZHMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvUHJvdG9jb2wvTGVnYWN5LzEwLjMvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCkBAIC03 NCw3ICs3NCw3IEBAIEluc3BlY3RvckJhY2tlbmQuYWN0aXZhdGVEb21haW4oIkNTUyIsIFsid2Vi Il0pOwogCiAvLyBDb25zb2xlLgogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNvbnNvbGVEaXNw YXRjaGVyID0gSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIuYmluZChJ bnNwZWN0b3JCYWNrZW5kLCAiQ29uc29sZSIpOwotSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVu dW0oIkNvbnNvbGUuQ29uc29sZU1lc3NhZ2VTb3VyY2UiLCB7WE1MOiAieG1sIiwgSmF2YXNjcmlw dDogImphdmFzY3JpcHQiLCBOZXR3b3JrOiAibmV0d29yayIsIENvbnNvbGVBUEk6ICJjb25zb2xl LWFwaSIsIFN0b3JhZ2U6ICJzdG9yYWdlIiwgQXBwY2FjaGU6ICJhcHBjYWNoZSIsIFJlbmRlcmlu ZzogInJlbmRlcmluZyIsIENTUzogImNzcyIsIFNlY3VyaXR5OiAic2VjdXJpdHkiLCBDb250ZW50 QmxvY2tlcjogImNvbnRlbnQtYmxvY2tlciIsIE90aGVyOiAib3RoZXIifSk7CitJbnNwZWN0b3JC YWNrZW5kLnJlZ2lzdGVyRW51bSgiQ29uc29sZS5Db25zb2xlTWVzc2FnZVNvdXJjZSIsIHtYTUw6 ICJ4bWwiLCBKYXZhU2NyaXB0OiAiamF2YXNjcmlwdCIsIE5ldHdvcms6ICJuZXR3b3JrIiwgQ29u c29sZUFQSTogImNvbnNvbGUtYXBpIiwgU3RvcmFnZTogInN0b3JhZ2UiLCBBcHBjYWNoZTogImFw cGNhY2hlIiwgUmVuZGVyaW5nOiAicmVuZGVyaW5nIiwgQ1NTOiAiY3NzIiwgU2VjdXJpdHk6ICJz ZWN1cml0eSIsIENvbnRlbnRCbG9ja2VyOiAiY29udGVudC1ibG9ja2VyIiwgT3RoZXI6ICJvdGhl ciJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJDb25zb2xlLkNvbnNvbGVNZXNz YWdlTGV2ZWwiLCB7TG9nOiAibG9nIiwgSW5mbzogImluZm8iLCBXYXJuaW5nOiAid2FybmluZyIs IEVycm9yOiAiZXJyb3IiLCBEZWJ1ZzogImRlYnVnIn0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdp c3RlckVudW0oIkNvbnNvbGUuQ29uc29sZU1lc3NhZ2VUeXBlIiwge0xvZzogImxvZyIsIERpcjog ImRpciIsIERpclhNTDogImRpcnhtbCIsIFRhYmxlOiAidGFibGUiLCBUcmFjZTogInRyYWNlIiwg Q2xlYXI6ICJjbGVhciIsIFN0YXJ0R3JvdXA6ICJzdGFydEdyb3VwIiwgU3RhcnRHcm91cENvbGxh cHNlZDogInN0YXJ0R3JvdXBDb2xsYXBzZWQiLCBFbmRHcm91cDogImVuZEdyb3VwIiwgQXNzZXJ0 OiAiYXNzZXJ0IiwgVGltaW5nOiAidGltaW5nIiwgUHJvZmlsZTogInByb2ZpbGUiLCBQcm9maWxl RW5kOiAicHJvZmlsZUVuZCJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFdmVudCgiQ29u c29sZS5tZXNzYWdlQWRkZWQiLCBbIm1lc3NhZ2UiXSk7CkBAIC0yNTgsNyArMjU4LDcgQEAgSW5z cGVjdG9yQmFja2VuZC5hY3RpdmF0ZURvbWFpbigiTGF5ZXJUcmVlIiwgWyJ3ZWIiXSk7CiAKIC8v IE1lbW9yeS4KIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJNZW1vcnlEaXNwYXRjaGVyID0gSW5z cGVjdG9yQmFja2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIuYmluZChJbnNwZWN0b3JCYWNr ZW5kLCAiTWVtb3J5Iik7Ci1JbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiTWVtb3J5LkNh dGVnb3J5RGF0YVR5cGUiLCB7SmF2YXNjcmlwdDogImphdmFzY3JpcHQiLCBKSVQ6ICJqaXQiLCBJ bWFnZXM6ICJpbWFnZXMiLCBMYXllcnM6ICJsYXllcnMiLCBQYWdlOiAicGFnZSIsIE90aGVyOiAi b3RoZXIifSk7CitJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiTWVtb3J5LkNhdGVnb3J5 RGF0YVR5cGUiLCB7SmF2YVNjcmlwdDogImphdmFzY3JpcHQiLCBKSVQ6ICJqaXQiLCBJbWFnZXM6 ICJpbWFnZXMiLCBMYXllcnM6ICJsYXllcnMiLCBQYWdlOiAicGFnZSIsIE90aGVyOiAib3RoZXIi fSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiTWVtb3J5Lk1lbW9yeVByZXNzdXJl U2V2ZXJpdHkiLCB7Q3JpdGljYWw6ICJjcml0aWNhbCIsIE5vbkNyaXRpY2FsOiAibm9uLWNyaXRp Y2FsIn0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2ZW50KCJNZW1vcnkubWVtb3J5UHJl c3N1cmUiLCBbInRpbWVzdGFtcCIsICJzZXZlcml0eSJdKTsKIEluc3BlY3RvckJhY2tlbmQucmVn aXN0ZXJFdmVudCgiTWVtb3J5LnRyYWNraW5nU3RhcnQiLCBbInRpbWVzdGFtcCJdKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2Fj eS8xMS4wL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS8xMS4wL0luc3BlY3RvckJhY2tlbmRDb21t YW5kcy5qcwppbmRleCAwNmVhNGUxYzM4Zi4uZmI0MGE3N2VjYjUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS8xMS4wL0luc3Bl Y3RvckJhY2tlbmRDb21tYW5kcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvMTEuMC9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMK QEAgLTc0LDcgKzc0LDcgQEAgSW5zcGVjdG9yQmFja2VuZC5hY3RpdmF0ZURvbWFpbigiQ1NTIiwg WyJ3ZWIiXSk7CiAKIC8vIENvbnNvbGUuCiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29uc29s ZURpc3BhdGNoZXIgPSBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRG9tYWluRGlzcGF0Y2hlci5i aW5kKEluc3BlY3RvckJhY2tlbmQsICJDb25zb2xlIik7Ci1JbnNwZWN0b3JCYWNrZW5kLnJlZ2lz dGVyRW51bSgiQ29uc29sZS5Db25zb2xlTWVzc2FnZVNvdXJjZSIsIHtYTUw6ICJ4bWwiLCBKYXZh c2NyaXB0OiAiamF2YXNjcmlwdCIsIE5ldHdvcms6ICJuZXR3b3JrIiwgQ29uc29sZUFQSTogImNv bnNvbGUtYXBpIiwgU3RvcmFnZTogInN0b3JhZ2UiLCBBcHBjYWNoZTogImFwcGNhY2hlIiwgUmVu ZGVyaW5nOiAicmVuZGVyaW5nIiwgQ1NTOiAiY3NzIiwgU2VjdXJpdHk6ICJzZWN1cml0eSIsIENv bnRlbnRCbG9ja2VyOiAiY29udGVudC1ibG9ja2VyIiwgT3RoZXI6ICJvdGhlciJ9KTsKK0luc3Bl Y3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJDb25zb2xlLkNvbnNvbGVNZXNzYWdlU291cmNlIiwg e1hNTDogInhtbCIsIEphdmFTY3JpcHQ6ICJqYXZhc2NyaXB0IiwgTmV0d29yazogIm5ldHdvcmsi LCBDb25zb2xlQVBJOiAiY29uc29sZS1hcGkiLCBTdG9yYWdlOiAic3RvcmFnZSIsIEFwcGNhY2hl OiAiYXBwY2FjaGUiLCBSZW5kZXJpbmc6ICJyZW5kZXJpbmciLCBDU1M6ICJjc3MiLCBTZWN1cml0 eTogInNlY3VyaXR5IiwgQ29udGVudEJsb2NrZXI6ICJjb250ZW50LWJsb2NrZXIiLCBPdGhlcjog Im90aGVyIn0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ29uc29s ZU1lc3NhZ2VMZXZlbCIsIHtMb2c6ICJsb2ciLCBJbmZvOiAiaW5mbyIsIFdhcm5pbmc6ICJ3YXJu aW5nIiwgRXJyb3I6ICJlcnJvciIsIERlYnVnOiAiZGVidWcifSk7CiBJbnNwZWN0b3JCYWNrZW5k LnJlZ2lzdGVyRW51bSgiQ29uc29sZS5Db25zb2xlTWVzc2FnZVR5cGUiLCB7TG9nOiAibG9nIiwg RGlyOiAiZGlyIiwgRGlyWE1MOiAiZGlyeG1sIiwgVGFibGU6ICJ0YWJsZSIsIFRyYWNlOiAidHJh Y2UiLCBDbGVhcjogImNsZWFyIiwgU3RhcnRHcm91cDogInN0YXJ0R3JvdXAiLCBTdGFydEdyb3Vw Q29sbGFwc2VkOiAic3RhcnRHcm91cENvbGxhcHNlZCIsIEVuZEdyb3VwOiAiZW5kR3JvdXAiLCBB c3NlcnQ6ICJhc3NlcnQiLCBUaW1pbmc6ICJ0aW1pbmciLCBQcm9maWxlOiAicHJvZmlsZSIsIFBy b2ZpbGVFbmQ6ICJwcm9maWxlRW5kIn0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2ZW50 KCJDb25zb2xlLm1lc3NhZ2VBZGRlZCIsIFsibWVzc2FnZSJdKTsKQEAgLTI3MSw3ICsyNzEsNyBA QCBJbnNwZWN0b3JCYWNrZW5kLmFjdGl2YXRlRG9tYWluKCJMYXllclRyZWUiLCBbIndlYiJdKTsK IAogLy8gTWVtb3J5LgogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3Rlck1lbW9yeURpc3BhdGNoZXIg PSBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRG9tYWluRGlzcGF0Y2hlci5iaW5kKEluc3BlY3Rv ckJhY2tlbmQsICJNZW1vcnkiKTsKLUluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJNZW1v cnkuQ2F0ZWdvcnlEYXRhVHlwZSIsIHtKYXZhc2NyaXB0OiAiamF2YXNjcmlwdCIsIEpJVDogImpp dCIsIEltYWdlczogImltYWdlcyIsIExheWVyczogImxheWVycyIsIFBhZ2U6ICJwYWdlIiwgT3Ro ZXI6ICJvdGhlciJ9KTsKK0luc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJNZW1vcnkuQ2F0 ZWdvcnlEYXRhVHlwZSIsIHtKYXZhU2NyaXB0OiAiamF2YXNjcmlwdCIsIEpJVDogImppdCIsIElt YWdlczogImltYWdlcyIsIExheWVyczogImxheWVycyIsIFBhZ2U6ICJwYWdlIiwgT3RoZXI6ICJv dGhlciJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJNZW1vcnkuTWVtb3J5UHJl c3N1cmVTZXZlcml0eSIsIHtDcml0aWNhbDogImNyaXRpY2FsIiwgTm9uQ3JpdGljYWw6ICJub24t Y3JpdGljYWwifSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRXZlbnQoIk1lbW9yeS5tZW1v cnlQcmVzc3VyZSIsIFsidGltZXN0YW1wIiwgInNldmVyaXR5Il0pOwogSW5zcGVjdG9yQmFja2Vu ZC5yZWdpc3RlckV2ZW50KCJNZW1vcnkudHJhY2tpbmdTdGFydCIsIFsidGltZXN0YW1wIl0pOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wv TGVnYWN5LzExLjMvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzExLjMvSW5zcGVjdG9yQmFja2Vu ZENvbW1hbmRzLmpzCmluZGV4IGFjZjFjMDVmNWQ3Li4zOTQyNjA2ZDdjNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzExLjMv SW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS8xMS4zL0luc3BlY3RvckJhY2tlbmRDb21tYW5k cy5qcwpAQCAtNjcsNyArNjcsNyBAQCBJbnNwZWN0b3JCYWNrZW5kLmFjdGl2YXRlRG9tYWluKCJD U1MiLCBbIndlYiJdKTsKIAogLy8gQ2FudmFzLgogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNh bnZhc0Rpc3BhdGNoZXIgPSBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRG9tYWluRGlzcGF0Y2hl ci5iaW5kKEluc3BlY3RvckJhY2tlbmQsICJDYW52YXMiKTsKLUluc3BlY3RvckJhY2tlbmQucmVn aXN0ZXJFbnVtKCJDYW52YXMuQ29udGV4dFR5cGUiLCB7Q2FudmFzMkQ6ICJjYW52YXMtMmQiLCBC aXRtYXBSZW5kZXJlcjogImJpdG1hcHJlbmRlcmVyIiwgV2ViR0w6ICJ3ZWJnbCIsIFdlYkdMMjog IndlYmdsMiIsIFdlYkdQVTogIndlYmdwdSJ9KTsKK0luc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJF bnVtKCJDYW52YXMuQ29udGV4dFR5cGUiLCB7Q2FudmFzMkQ6ICJjYW52YXMtMmQiLCBCaXRtYXBS ZW5kZXJlcjogImJpdG1hcHJlbmRlcmVyIiwgV2ViR0w6ICJ3ZWJnbCIsIFdlYkdMMjogIndlYmds MiIsIFdlYmdwdTogIndlYmdwdSJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJD YW52YXMuU2hhZGVyVHlwZSIsIHtGcmFnbWVudDogImZyYWdtZW50IiwgVmVydGV4OiAidmVydGV4 In0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2ZW50KCJDYW52YXMuY2FudmFzQWRkZWQi LCBbImNhbnZhcyJdKTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFdmVudCgiQ2FudmFzLmNh bnZhc1JlbW92ZWQiLCBbImNhbnZhc0lkIl0pOwpAQCAtOTMsNyArOTMsNyBAQCBJbnNwZWN0b3JC YWNrZW5kLmFjdGl2YXRlRG9tYWluKCJDYW52YXMiLCBbIndlYiJdKTsKIAogLy8gQ29uc29sZS4K IEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJDb25zb2xlRGlzcGF0Y2hlciA9IEluc3BlY3RvckJh Y2tlbmQucmVnaXN0ZXJEb21haW5EaXNwYXRjaGVyLmJpbmQoSW5zcGVjdG9yQmFja2VuZCwgIkNv bnNvbGUiKTsKLUluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJDb25zb2xlLkNoYW5uZWxT b3VyY2UiLCB7WE1MOiAieG1sIiwgSmF2YXNjcmlwdDogImphdmFzY3JpcHQiLCBOZXR3b3JrOiAi bmV0d29yayIsIENvbnNvbGVBUEk6ICJjb25zb2xlLWFwaSIsIFN0b3JhZ2U6ICJzdG9yYWdlIiwg QXBwY2FjaGU6ICJhcHBjYWNoZSIsIFJlbmRlcmluZzogInJlbmRlcmluZyIsIENTUzogImNzcyIs IFNlY3VyaXR5OiAic2VjdXJpdHkiLCBDb250ZW50QmxvY2tlcjogImNvbnRlbnQtYmxvY2tlciIs IE1lZGlhOiAibWVkaWEiLCBXZWJSVEM6ICJ3ZWJydGMiLCBPdGhlcjogIm90aGVyIn0pOworSW5z cGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ2hhbm5lbFNvdXJjZSIsIHtYTUw6 ICJ4bWwiLCBKYXZhU2NyaXB0OiAiamF2YXNjcmlwdCIsIE5ldHdvcms6ICJuZXR3b3JrIiwgQ29u c29sZUFQSTogImNvbnNvbGUtYXBpIiwgU3RvcmFnZTogInN0b3JhZ2UiLCBBcHBjYWNoZTogImFw cGNhY2hlIiwgUmVuZGVyaW5nOiAicmVuZGVyaW5nIiwgQ1NTOiAiY3NzIiwgU2VjdXJpdHk6ICJz ZWN1cml0eSIsIENvbnRlbnRCbG9ja2VyOiAiY29udGVudC1ibG9ja2VyIiwgTWVkaWE6ICJtZWRp YSIsIFdlYlJUQzogIndlYnJ0YyIsIE90aGVyOiAib3RoZXIifSk7CiBJbnNwZWN0b3JCYWNrZW5k LnJlZ2lzdGVyRW51bSgiQ29uc29sZS5DaGFubmVsTGV2ZWwiLCB7T2ZmOiAib2ZmIiwgQmFzaWM6 ICJiYXNpYyIsIFZlcmJvc2U6ICJ2ZXJib3NlIn0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3Rl ckVudW0oIkNvbnNvbGUuQ29uc29sZU1lc3NhZ2VMZXZlbCIsIHtMb2c6ICJsb2ciLCBJbmZvOiAi aW5mbyIsIFdhcm5pbmc6ICJ3YXJuaW5nIiwgRXJyb3I6ICJlcnJvciIsIERlYnVnOiAiZGVidWci fSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiQ29uc29sZS5Db25zb2xlTWVzc2Fn ZVR5cGUiLCB7TG9nOiAibG9nIiwgRGlyOiAiZGlyIiwgRGlyWE1MOiAiZGlyeG1sIiwgVGFibGU6 ICJ0YWJsZSIsIFRyYWNlOiAidHJhY2UiLCBDbGVhcjogImNsZWFyIiwgU3RhcnRHcm91cDogInN0 YXJ0R3JvdXAiLCBTdGFydEdyb3VwQ29sbGFwc2VkOiAic3RhcnRHcm91cENvbGxhcHNlZCIsIEVu ZEdyb3VwOiAiZW5kR3JvdXAiLCBBc3NlcnQ6ICJhc3NlcnQiLCBUaW1pbmc6ICJ0aW1pbmciLCBQ cm9maWxlOiAicHJvZmlsZSIsIFByb2ZpbGVFbmQ6ICJwcm9maWxlRW5kIn0pOwpAQCAtMjk4LDcg KzI5OCw3IEBAIEluc3BlY3RvckJhY2tlbmQuYWN0aXZhdGVEb21haW4oIkxheWVyVHJlZSIsIFsi d2ViIl0pOwogCiAvLyBNZW1vcnkuCiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyTWVtb3J5RGlz cGF0Y2hlciA9IEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJEb21haW5EaXNwYXRjaGVyLmJpbmQo SW5zcGVjdG9yQmFja2VuZCwgIk1lbW9yeSIpOwotSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVu dW0oIk1lbW9yeS5DYXRlZ29yeURhdGFUeXBlIiwge0phdmFzY3JpcHQ6ICJqYXZhc2NyaXB0Iiwg SklUOiAiaml0IiwgSW1hZ2VzOiAiaW1hZ2VzIiwgTGF5ZXJzOiAibGF5ZXJzIiwgUGFnZTogInBh Z2UiLCBPdGhlcjogIm90aGVyIn0pOworSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIk1l bW9yeS5DYXRlZ29yeURhdGFUeXBlIiwge0phdmFTY3JpcHQ6ICJqYXZhc2NyaXB0IiwgSklUOiAi aml0IiwgSW1hZ2VzOiAiaW1hZ2VzIiwgTGF5ZXJzOiAibGF5ZXJzIiwgUGFnZTogInBhZ2UiLCBP dGhlcjogIm90aGVyIn0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIk1lbW9yeS5N ZW1vcnlQcmVzc3VyZVNldmVyaXR5Iiwge0NyaXRpY2FsOiAiY3JpdGljYWwiLCBOb25Dcml0aWNh bDogIm5vbi1jcml0aWNhbCJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFdmVudCgiTWVt b3J5Lm1lbW9yeVByZXNzdXJlIiwgWyJ0aW1lc3RhbXAiLCAic2V2ZXJpdHkiXSk7CiBJbnNwZWN0 b3JCYWNrZW5kLnJlZ2lzdGVyRXZlbnQoIk1lbW9yeS50cmFja2luZ1N0YXJ0IiwgWyJ0aW1lc3Rh bXAiXSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Q cm90b2NvbC9MZWdhY3kvMTIuMC9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvMTIuMC9JbnNwZWN0 b3JCYWNrZW5kQ29tbWFuZHMuanMKaW5kZXggMDAwZGY4NTFmOWQuLjNhMDQ2Y2Y4YmZiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdh Y3kvMTIuMC9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzEyLjAvSW5zcGVjdG9yQmFja2Vu ZENvbW1hbmRzLmpzCkBAIC02Nyw3ICs2Nyw3IEBAIEluc3BlY3RvckJhY2tlbmQuYWN0aXZhdGVE b21haW4oIkNTUyIsIFsid2ViIl0pOwogCiAvLyBDYW52YXMuCiBJbnNwZWN0b3JCYWNrZW5kLnJl Z2lzdGVyQ2FudmFzRGlzcGF0Y2hlciA9IEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJEb21haW5E aXNwYXRjaGVyLmJpbmQoSW5zcGVjdG9yQmFja2VuZCwgIkNhbnZhcyIpOwotSW5zcGVjdG9yQmFj a2VuZC5yZWdpc3RlckVudW0oIkNhbnZhcy5Db250ZXh0VHlwZSIsIHtDYW52YXMyRDogImNhbnZh cy0yZCIsIEJpdG1hcFJlbmRlcmVyOiAiYml0bWFwcmVuZGVyZXIiLCBXZWJHTDogIndlYmdsIiwg V2ViR0wyOiAid2ViZ2wyIiwgV2ViR1BVOiAid2ViZ3B1In0pOworSW5zcGVjdG9yQmFja2VuZC5y ZWdpc3RlckVudW0oIkNhbnZhcy5Db250ZXh0VHlwZSIsIHtDYW52YXMyRDogImNhbnZhcy0yZCIs IEJpdG1hcFJlbmRlcmVyOiAiYml0bWFwcmVuZGVyZXIiLCBXZWJHTDogIndlYmdsIiwgV2ViR0wy OiAid2ViZ2wyIiwgV2ViZ3B1OiAid2ViZ3B1In0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3Rl ckVudW0oIkNhbnZhcy5TaGFkZXJUeXBlIiwge0ZyYWdtZW50OiAiZnJhZ21lbnQiLCBWZXJ0ZXg6 ICJ2ZXJ0ZXgifSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRXZlbnQoIkNhbnZhcy5jYW52 YXNBZGRlZCIsIFsiY2FudmFzIl0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2ZW50KCJD YW52YXMuY2FudmFzUmVtb3ZlZCIsIFsiY2FudmFzSWQiXSk7CkBAIC05NCw3ICs5NCw3IEBAIElu c3BlY3RvckJhY2tlbmQuYWN0aXZhdGVEb21haW4oIkNhbnZhcyIsIFsid2ViIl0pOwogCiAvLyBD b25zb2xlLgogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNvbnNvbGVEaXNwYXRjaGVyID0gSW5z cGVjdG9yQmFja2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIuYmluZChJbnNwZWN0b3JCYWNr ZW5kLCAiQ29uc29sZSIpOwotSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNvbGUu Q2hhbm5lbFNvdXJjZSIsIHtYTUw6ICJ4bWwiLCBKYXZhc2NyaXB0OiAiamF2YXNjcmlwdCIsIE5l dHdvcms6ICJuZXR3b3JrIiwgQ29uc29sZUFQSTogImNvbnNvbGUtYXBpIiwgU3RvcmFnZTogInN0 b3JhZ2UiLCBBcHBjYWNoZTogImFwcGNhY2hlIiwgUmVuZGVyaW5nOiAicmVuZGVyaW5nIiwgQ1NT OiAiY3NzIiwgU2VjdXJpdHk6ICJzZWN1cml0eSIsIENvbnRlbnRCbG9ja2VyOiAiY29udGVudC1i bG9ja2VyIiwgTWVkaWE6ICJtZWRpYSIsIFdlYlJUQzogIndlYnJ0YyIsIE90aGVyOiAib3RoZXIi fSk7CitJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiQ29uc29sZS5DaGFubmVsU291cmNl Iiwge1hNTDogInhtbCIsIEphdmFTY3JpcHQ6ICJqYXZhc2NyaXB0IiwgTmV0d29yazogIm5ldHdv cmsiLCBDb25zb2xlQVBJOiAiY29uc29sZS1hcGkiLCBTdG9yYWdlOiAic3RvcmFnZSIsIEFwcGNh Y2hlOiAiYXBwY2FjaGUiLCBSZW5kZXJpbmc6ICJyZW5kZXJpbmciLCBDU1M6ICJjc3MiLCBTZWN1 cml0eTogInNlY3VyaXR5IiwgQ29udGVudEJsb2NrZXI6ICJjb250ZW50LWJsb2NrZXIiLCBNZWRp YTogIm1lZGlhIiwgV2ViUlRDOiAid2VicnRjIiwgT3RoZXI6ICJvdGhlciJ9KTsKIEluc3BlY3Rv ckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJDb25zb2xlLkNoYW5uZWxMZXZlbCIsIHtPZmY6ICJvZmYi LCBCYXNpYzogImJhc2ljIiwgVmVyYm9zZTogInZlcmJvc2UifSk7CiBJbnNwZWN0b3JCYWNrZW5k LnJlZ2lzdGVyRW51bSgiQ29uc29sZS5Db25zb2xlTWVzc2FnZUxldmVsIiwge0xvZzogImxvZyIs IEluZm86ICJpbmZvIiwgV2FybmluZzogIndhcm5pbmciLCBFcnJvcjogImVycm9yIiwgRGVidWc6 ICJkZWJ1ZyJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJDb25zb2xlLkNvbnNv bGVNZXNzYWdlVHlwZSIsIHtMb2c6ICJsb2ciLCBEaXI6ICJkaXIiLCBEaXJYTUw6ICJkaXJ4bWwi LCBUYWJsZTogInRhYmxlIiwgVHJhY2U6ICJ0cmFjZSIsIENsZWFyOiAiY2xlYXIiLCBTdGFydEdy b3VwOiAic3RhcnRHcm91cCIsIFN0YXJ0R3JvdXBDb2xsYXBzZWQ6ICJzdGFydEdyb3VwQ29sbGFw c2VkIiwgRW5kR3JvdXA6ICJlbmRHcm91cCIsIEFzc2VydDogImFzc2VydCIsIFRpbWluZzogInRp bWluZyIsIFByb2ZpbGU6ICJwcm9maWxlIiwgUHJvZmlsZUVuZDogInByb2ZpbGVFbmQifSk7CkBA IC0zMDAsNyArMzAwLDcgQEAgSW5zcGVjdG9yQmFja2VuZC5hY3RpdmF0ZURvbWFpbigiTGF5ZXJU cmVlIiwgWyJ3ZWIiXSk7CiAKIC8vIE1lbW9yeS4KIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJN ZW1vcnlEaXNwYXRjaGVyID0gSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNo ZXIuYmluZChJbnNwZWN0b3JCYWNrZW5kLCAiTWVtb3J5Iik7Ci1JbnNwZWN0b3JCYWNrZW5kLnJl Z2lzdGVyRW51bSgiTWVtb3J5LkNhdGVnb3J5RGF0YVR5cGUiLCB7SmF2YXNjcmlwdDogImphdmFz Y3JpcHQiLCBKSVQ6ICJqaXQiLCBJbWFnZXM6ICJpbWFnZXMiLCBMYXllcnM6ICJsYXllcnMiLCBQ YWdlOiAicGFnZSIsIE90aGVyOiAib3RoZXIifSk7CitJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVy RW51bSgiTWVtb3J5LkNhdGVnb3J5RGF0YVR5cGUiLCB7SmF2YVNjcmlwdDogImphdmFzY3JpcHQi LCBKSVQ6ICJqaXQiLCBJbWFnZXM6ICJpbWFnZXMiLCBMYXllcnM6ICJsYXllcnMiLCBQYWdlOiAi cGFnZSIsIE90aGVyOiAib3RoZXIifSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgi TWVtb3J5Lk1lbW9yeVByZXNzdXJlU2V2ZXJpdHkiLCB7Q3JpdGljYWw6ICJjcml0aWNhbCIsIE5v bkNyaXRpY2FsOiAibm9uLWNyaXRpY2FsIn0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2 ZW50KCJNZW1vcnkubWVtb3J5UHJlc3N1cmUiLCBbInRpbWVzdGFtcCIsICJzZXZlcml0eSJdKTsK IEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFdmVudCgiTWVtb3J5LnRyYWNraW5nU3RhcnQiLCBb InRpbWVzdGFtcCJdKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS84LjAvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzguMC9J bnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMKaW5kZXggZjI4ODI3NjU2YWIuLjU5NDM3ZGViZjA2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2Nv bC9MZWdhY3kvOC4wL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvOC4wL0luc3BlY3RvckJh Y2tlbmRDb21tYW5kcy5qcwpAQCAtMzAsNyArMzAsNyBAQAogCiAvLyBDb25zb2xlLgogSW5zcGVj dG9yQmFja2VuZC5yZWdpc3RlckNvbnNvbGVEaXNwYXRjaGVyID0gSW5zcGVjdG9yQmFja2VuZC5y ZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIuYmluZChJbnNwZWN0b3JCYWNrZW5kLCAiQ29uc29sZSIp OwotSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ29uc29sZU1lc3NhZ2VT b3VyY2UiLCB7WE1MOiAieG1sIiwgSmF2YXNjcmlwdDogImphdmFzY3JpcHQiLCBOZXR3b3JrOiAi bmV0d29yayIsIENvbnNvbGVBUEk6ICJjb25zb2xlLWFwaSIsIFN0b3JhZ2U6ICJzdG9yYWdlIiwg QXBwY2FjaGU6ICJhcHBjYWNoZSIsIFJlbmRlcmluZzogInJlbmRlcmluZyIsIENTUzogImNzcyIs IFNlY3VyaXR5OiAic2VjdXJpdHkiLCBPdGhlcjogIm90aGVyIn0pOworSW5zcGVjdG9yQmFja2Vu ZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ29uc29sZU1lc3NhZ2VTb3VyY2UiLCB7WE1MOiAieG1s IiwgSmF2YVNjcmlwdDogImphdmFzY3JpcHQiLCBOZXR3b3JrOiAibmV0d29yayIsIENvbnNvbGVB UEk6ICJjb25zb2xlLWFwaSIsIFN0b3JhZ2U6ICJzdG9yYWdlIiwgQXBwY2FjaGU6ICJhcHBjYWNo ZSIsIFJlbmRlcmluZzogInJlbmRlcmluZyIsIENTUzogImNzcyIsIFNlY3VyaXR5OiAic2VjdXJp dHkiLCBPdGhlcjogIm90aGVyIn0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNv bnNvbGUuQ29uc29sZU1lc3NhZ2VMZXZlbCIsIHtMb2c6ICJsb2ciLCBXYXJuaW5nOiAid2Fybmlu ZyIsIEVycm9yOiAiZXJyb3IiLCBEZWJ1ZzogImRlYnVnIn0pOwogSW5zcGVjdG9yQmFja2VuZC5y ZWdpc3RlckVudW0oIkNvbnNvbGUuQ29uc29sZU1lc3NhZ2VUeXBlIiwge0xvZzogImxvZyIsIERp cjogImRpciIsIERpclhNTDogImRpcnhtbCIsIFRhYmxlOiAidGFibGUiLCBUcmFjZTogInRyYWNl IiwgQ2xlYXI6ICJjbGVhciIsIFN0YXJ0R3JvdXA6ICJzdGFydEdyb3VwIiwgU3RhcnRHcm91cENv bGxhcHNlZDogInN0YXJ0R3JvdXBDb2xsYXBzZWQiLCBFbmRHcm91cDogImVuZEdyb3VwIiwgQXNz ZXJ0OiAiYXNzZXJ0IiwgVGltaW5nOiAidGltaW5nIiwgUHJvZmlsZTogInByb2ZpbGUiLCBQcm9m aWxlRW5kOiAicHJvZmlsZUVuZCJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFdmVudCgi Q29uc29sZS5tZXNzYWdlQWRkZWQiLCBbIm1lc3NhZ2UiXSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvOS4wL0luc3BlY3Rv ckJhY2tlbmRDb21tYW5kcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1Byb3RvY29sL0xlZ2FjeS85LjAvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpzCmluZGV4IDRh ZTgyODgyMjUwLi5hOGY4ZDVmOGQzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzkuMC9JbnNwZWN0b3JCYWNrZW5kQ29tbWFu ZHMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wv TGVnYWN5LzkuMC9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMKQEAgLTcwLDcgKzcwLDcgQEAg SW5zcGVjdG9yQmFja2VuZC5hY3RpdmF0ZURvbWFpbigiQ1NTIiwgWyJ3ZWIiXSk7CiAKIC8vIENv bnNvbGUuCiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29uc29sZURpc3BhdGNoZXIgPSBJbnNw ZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRG9tYWluRGlzcGF0Y2hlci5iaW5kKEluc3BlY3RvckJhY2tl bmQsICJDb25zb2xlIik7Ci1JbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiQ29uc29sZS5D b25zb2xlTWVzc2FnZVNvdXJjZSIsIHtYTUw6ICJ4bWwiLCBKYXZhc2NyaXB0OiAiamF2YXNjcmlw dCIsIE5ldHdvcms6ICJuZXR3b3JrIiwgQ29uc29sZUFQSTogImNvbnNvbGUtYXBpIiwgU3RvcmFn ZTogInN0b3JhZ2UiLCBBcHBjYWNoZTogImFwcGNhY2hlIiwgUmVuZGVyaW5nOiAicmVuZGVyaW5n IiwgQ1NTOiAiY3NzIiwgU2VjdXJpdHk6ICJzZWN1cml0eSIsIENvbnRlbnRCbG9ja2VyOiAiY29u dGVudC1ibG9ja2VyIiwgT3RoZXI6ICJvdGhlciJ9KTsKK0luc3BlY3RvckJhY2tlbmQucmVnaXN0 ZXJFbnVtKCJDb25zb2xlLkNvbnNvbGVNZXNzYWdlU291cmNlIiwge1hNTDogInhtbCIsIEphdmFT Y3JpcHQ6ICJqYXZhc2NyaXB0IiwgTmV0d29yazogIm5ldHdvcmsiLCBDb25zb2xlQVBJOiAiY29u c29sZS1hcGkiLCBTdG9yYWdlOiAic3RvcmFnZSIsIEFwcGNhY2hlOiAiYXBwY2FjaGUiLCBSZW5k ZXJpbmc6ICJyZW5kZXJpbmciLCBDU1M6ICJjc3MiLCBTZWN1cml0eTogInNlY3VyaXR5IiwgQ29u dGVudEJsb2NrZXI6ICJjb250ZW50LWJsb2NrZXIiLCBPdGhlcjogIm90aGVyIn0pOwogSW5zcGVj dG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNvbGUuQ29uc29sZU1lc3NhZ2VMZXZlbCIsIHtM b2c6ICJsb2ciLCBJbmZvOiAiaW5mbyIsIFdhcm5pbmc6ICJ3YXJuaW5nIiwgRXJyb3I6ICJlcnJv ciIsIERlYnVnOiAiZGVidWcifSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiQ29u c29sZS5Db25zb2xlTWVzc2FnZVR5cGUiLCB7TG9nOiAibG9nIiwgRGlyOiAiZGlyIiwgRGlyWE1M OiAiZGlyeG1sIiwgVGFibGU6ICJ0YWJsZSIsIFRyYWNlOiAidHJhY2UiLCBDbGVhcjogImNsZWFy IiwgU3RhcnRHcm91cDogInN0YXJ0R3JvdXAiLCBTdGFydEdyb3VwQ29sbGFwc2VkOiAic3RhcnRH cm91cENvbGxhcHNlZCIsIEVuZEdyb3VwOiAiZW5kR3JvdXAiLCBBc3NlcnQ6ICJhc3NlcnQiLCBU aW1pbmc6ICJ0aW1pbmciLCBQcm9maWxlOiAicHJvZmlsZSIsIFByb2ZpbGVFbmQ6ICJwcm9maWxl RW5kIn0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2ZW50KCJDb25zb2xlLm1lc3NhZ2VB ZGRlZCIsIFsibWVzc2FnZSJdKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS85LjMvSW5zcGVjdG9yQmFja2VuZENvbW1hbmRz LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5 LzkuMy9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMKaW5kZXggODVhZGQ3OTE2NTIuLmE0Njdm MGM5NTFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Q cm90b2NvbC9MZWdhY3kvOS4zL0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvOS4zL0luc3Bl Y3RvckJhY2tlbmRDb21tYW5kcy5qcwpAQCAtNzQsNyArNzQsNyBAQCBJbnNwZWN0b3JCYWNrZW5k LmFjdGl2YXRlRG9tYWluKCJDU1MiLCBbIndlYiJdKTsKIAogLy8gQ29uc29sZS4KIEluc3BlY3Rv ckJhY2tlbmQucmVnaXN0ZXJDb25zb2xlRGlzcGF0Y2hlciA9IEluc3BlY3RvckJhY2tlbmQucmVn aXN0ZXJEb21haW5EaXNwYXRjaGVyLmJpbmQoSW5zcGVjdG9yQmFja2VuZCwgIkNvbnNvbGUiKTsK LUluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJDb25zb2xlLkNvbnNvbGVNZXNzYWdlU291 cmNlIiwge1hNTDogInhtbCIsIEphdmFzY3JpcHQ6ICJqYXZhc2NyaXB0IiwgTmV0d29yazogIm5l dHdvcmsiLCBDb25zb2xlQVBJOiAiY29uc29sZS1hcGkiLCBTdG9yYWdlOiAic3RvcmFnZSIsIEFw cGNhY2hlOiAiYXBwY2FjaGUiLCBSZW5kZXJpbmc6ICJyZW5kZXJpbmciLCBDU1M6ICJjc3MiLCBT ZWN1cml0eTogInNlY3VyaXR5IiwgQ29udGVudEJsb2NrZXI6ICJjb250ZW50LWJsb2NrZXIiLCBP dGhlcjogIm90aGVyIn0pOworSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIkNvbnNvbGUu Q29uc29sZU1lc3NhZ2VTb3VyY2UiLCB7WE1MOiAieG1sIiwgSmF2YVNjcmlwdDogImphdmFzY3Jp cHQiLCBOZXR3b3JrOiAibmV0d29yayIsIENvbnNvbGVBUEk6ICJjb25zb2xlLWFwaSIsIFN0b3Jh Z2U6ICJzdG9yYWdlIiwgQXBwY2FjaGU6ICJhcHBjYWNoZSIsIFJlbmRlcmluZzogInJlbmRlcmlu ZyIsIENTUzogImNzcyIsIFNlY3VyaXR5OiAic2VjdXJpdHkiLCBDb250ZW50QmxvY2tlcjogImNv bnRlbnQtYmxvY2tlciIsIE90aGVyOiAib3RoZXIifSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lz dGVyRW51bSgiQ29uc29sZS5Db25zb2xlTWVzc2FnZUxldmVsIiwge0xvZzogImxvZyIsIEluZm86 ICJpbmZvIiwgV2FybmluZzogIndhcm5pbmciLCBFcnJvcjogImVycm9yIiwgRGVidWc6ICJkZWJ1 ZyJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJDb25zb2xlLkNvbnNvbGVNZXNz YWdlVHlwZSIsIHtMb2c6ICJsb2ciLCBEaXI6ICJkaXIiLCBEaXJYTUw6ICJkaXJ4bWwiLCBUYWJs ZTogInRhYmxlIiwgVHJhY2U6ICJ0cmFjZSIsIENsZWFyOiAiY2xlYXIiLCBTdGFydEdyb3VwOiAi c3RhcnRHcm91cCIsIFN0YXJ0R3JvdXBDb2xsYXBzZWQ6ICJzdGFydEdyb3VwQ29sbGFwc2VkIiwg RW5kR3JvdXA6ICJlbmRHcm91cCIsIEFzc2VydDogImFzc2VydCIsIFRpbWluZzogInRpbWluZyIs IFByb2ZpbGU6ICJwcm9maWxlIiwgUHJvZmlsZUVuZDogInByb2ZpbGVFbmQifSk7CiBJbnNwZWN0 b3JCYWNrZW5kLnJlZ2lzdGVyRXZlbnQoIkNvbnNvbGUubWVzc2FnZUFkZGVkIiwgWyJtZXNzYWdl Il0pOwo=