180527 2017-12-07 06:39:21 -0800 Simplify log channel configuration UI 2017-12-07 17:53:36 -0800 1 1 1 Unclassified WebKit Web Inspector Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue ews-watchlist inspector-bugzilla-changes jlewis3 joepeck keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1379088 0 eric.carlson 2017-12-07 06:39:21 -0800 Don't include all five log levels in the log channel configuration popups, simplify to just "Off", "Basic", and "Verbose". 1379089 1 webkit-bug-importer 2017-12-07 06:42:32 -0800 <rdar://problem/35908382> 1379090 2 328692 eric.carlson 2017-12-07 06:45:11 -0800 Created attachment 328692 Proposed patch 1379156 3 328692 joepeck 2017-12-07 10:46:05 -0800 Comment on attachment 328692 Proposed patch r=me 1379169 4 328692 commit-queue 2017-12-07 11:06:20 -0800 Comment on attachment 328692 Proposed patch Clearing flags on attachment: 328692 Committed r225634: <https://trac.webkit.org/changeset/225634> 1379170 5 commit-queue 2017-12-07 11:06:22 -0800 All reviewed patches have been landed. Closing bug. 1379242 6 jlewis3 2017-12-07 13:11:06 -0800 This patch caused the Layout test inspector/console/webcore-logging.html to timeout with a text difference consistently on High Sierra and Sierra: https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=inspector%2Fconsole%2Fwebcore-logging.html https://build.webkit.org/results/Apple%20High%20Sierra%20Release%20WK1%20(Tests)/r225635%20(1868)/results.html https://build.webkit.org/builders/Apple%20High%20Sierra%20Release%20WK1%20(Tests)/builds/1868 Diff: --- /Volumes/Data/slave/highsierra-release-tests-wk1/build/layout-test-results/inspector/console/webcore-logging-expected.txt +++ /Volumes/Data/slave/highsierra-release-tests-wk1/build/layout-test-results/inspector/console/webcore-logging-actual.txt @@ -1,3 +1,4 @@ +FAIL: Timed out waiting for notifyDone to be called Test WebKit logging configuration and console display. @@ -27,6 +28,8 @@ -- Running test case: Console.Logging.MediaLogging PASS: Media logging disabled. -PASS: Media logging has been enabled. -PASS: Media log message should have source 'media'. +ERROR: Protocol Error: Invalid type of argument 'level' for command 'Console.setLoggingChannelLevel' call. It must be 'string' but it is 'undefined'. +FAIL: Media logging has been enabled. + Expected: truthy + Actual: false I was able to reproduce the timeout locally and when I tested before this patch the timeout was not reproducible. 1379254 7 jlewis3 2017-12-07 13:28:24 -0800 Reverted r225634 for reason: This caused layout tests to time out. Committed r225643: <https://trac.webkit.org/changeset/225643> 1379332 8 joepeck 2017-12-07 15:58:08 -0800 > -- Running test case: Console.Logging.MediaLogging > PASS: Media logging disabled. > -PASS: Media logging has been enabled. > -PASS: Media log message should have source 'media'. > +ERROR: Protocol Error: Invalid type of argument 'level' for command > 'Console.setLoggingChannelLevel' call. It must be 'string' but it is > 'undefined'. > +FAIL: Media logging has been enabled. > + Expected: truthy > + Actual: false Oo. Looks like these two lines in the test need to change: ConsoleAgent.setLoggingChannelLevel(channel.source, WI.LoggingChannel.Level.Log); ... InspectorTest.expectThat(mediaChannel.level === WI.LoggingChannel.Level.Log, "Media logging has been enabled."); From "Level.Log" to "Level.Basic", since "Level.Log" no longer exists. 1379382 9 328760 eric.carlson 2017-12-07 17:13:34 -0800 Created attachment 328760 Updated patch. 1379406 10 328760 commit-queue 2017-12-07 17:53:35 -0800 Comment on attachment 328760 Updated patch. Clearing flags on attachment: 328760 Committed r225663: <https://trac.webkit.org/changeset/225663> 1379407 11 commit-queue 2017-12-07 17:53:36 -0800 All reviewed patches have been landed. Closing bug. 328692 2017-12-07 06:45:11 -0800 2017-12-07 11:06:20 -0800 Proposed patch simplify_menu_patch_2.txt text/plain 9663 eric.carlson SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjI1NjI1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDE3LTEyLTA3ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisg ICAgICAgIFNpbXBsaWZ5IGxvZyBjaGFubmVsIGNvbmZpZ3VyYXRpb24gVUkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MDUyNworICAgICAgICA8cmRh cjovL3Byb2JsZW0vMzU5MDgzODI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvdG9jb2wvQ29uc29sZS5qc29uOgorCiAyMDE3 LTEyLTA2ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWZhY3Rv cmluZzogUmVuYW1lIFNjcmFtYmxlZFB0ciB0byBQb2lzb25lZC4KSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvQ29uc29sZS5qc29uCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvQ29uc29sZS5qc29uCShy ZXZpc2lvbiAyMjU1MjEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3Rv Y29sL0NvbnNvbGUuanNvbgkod29ya2luZyBjb3B5KQpAQCAtMTIsNyArMTIsNyBAQAogICAgICAg ICB7CiAgICAgICAgICAgICAiaWQiOiAiQ2hhbm5lbExldmVsIiwKICAgICAgICAgICAgICJ0eXBl IjogInN0cmluZyIsCi0gICAgICAgICAgICAiZW51bSI6IFsib2ZmIiwgImxvZyIsICJlcnJvciIs ICJ3YXJuaW5nIiwgImluZm8iLCAiZGVidWciXSwKKyAgICAgICAgICAgICJlbnVtIjogWyJvZmYi LCAiYmFzaWMiLCAidmVyYm9zZSJdLAogICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkxldmVs IG9mIGxvZ2dpbmcuIgogICAgICAgICB9LAogICAgICAgICB7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCShyZXZp c2lvbiAyMjU1MjEpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxNyBAQAorMjAxNy0xMi0wNyAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29u QGFwcGxlLmNvbT4KKworICAgICAgICBTaW1wbGlmeSBsb2cgY2hhbm5lbCBjb25maWd1cmF0aW9u IFVJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODA1 MjcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM1OTA4MzgyPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAtLSBubyBjaGFuZ2Ug aW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvV2ViQ29uc29s ZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvbnNvbGVBZ2VudDo6Z2V0TG9nZ2lu Z0NoYW5uZWxzKToKKyAgICAgICAgKFdlYkNvcmU6OmNoYW5uZWxDb25maWd1cmF0aW9uRm9yU3Ry aW5nKToKKwogMjAxNy0xMi0wNSAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgog CiAgICAgICAgIDx2aWRlbz4gYW5kIHNjYWxlKCkgdHJhbnNmb3JtcyB5aWVsZCBzaHJ1bmsgc21h bGwgb3IgY2xpcHBlZCBjb250cm9scwpJbmRleDogU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Fn ZW50cy9XZWJDb25zb2xlQWdlbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9hZ2VudHMvV2ViQ29uc29sZUFnZW50LmNwcAkocmV2aXNpb24gMjI1NTIxKQorKysg U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9XZWJDb25zb2xlQWdlbnQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC02NiwyMyArNjYsMTcgQEAgdm9pZCBXZWJDb25zb2xlQWdlbnQ6OmdldExv Z2dpbmdDaGFubmVscwogICAgICAgICBpZiAoIWxvZ0NoYW5uZWwpCiAgICAgICAgICAgICByZXR1 cm47CiAKLSAgICAgICAgSW5zcGVjdG9yOjpQcm90b2NvbDo6Q29uc29sZTo6Q2hhbm5lbExldmVs IGxldmVsID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6Q29uc29sZTo6Q2hhbm5lbExldmVsOjpPZmY7 CisgICAgICAgIGF1dG8gbGV2ZWwgPSBJbnNwZWN0b3I6OlByb3RvY29sOjpDb25zb2xlOjpDaGFu bmVsTGV2ZWw6Ok9mZjsKICAgICAgICAgaWYgKGxvZ0NoYW5uZWwtPnN0YXRlICE9IFdURkxvZ0No YW5uZWxPZmYpIHsKICAgICAgICAgICAgIHN3aXRjaCAobG9nQ2hhbm5lbC0+bGV2ZWwpIHsKICAg ICAgICAgICAgIGNhc2UgV1RGTG9nTGV2ZWxBbHdheXM6Ci0gICAgICAgICAgICAgICAgbGV2ZWwg PSBJbnNwZWN0b3I6OlByb3RvY29sOjpDb25zb2xlOjpDaGFubmVsTGV2ZWw6OkxvZzsKLSAgICAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgV1RGTG9nTGV2ZWxFcnJvcjoKLSAg ICAgICAgICAgICAgICBsZXZlbCA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNvbnNvbGU6OkNoYW5u ZWxMZXZlbDo6RXJyb3I7Ci0gICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNl IFdURkxvZ0xldmVsV2FybmluZzoKLSAgICAgICAgICAgICAgICBsZXZlbCA9IEluc3BlY3Rvcjo6 UHJvdG9jb2w6OkNvbnNvbGU6OkNoYW5uZWxMZXZlbDo6V2FybmluZzsKKyAgICAgICAgICAgICAg ICBsZXZlbCA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNvbnNvbGU6OkNoYW5uZWxMZXZlbDo6QmFz aWM7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNlIFdURkxvZ0xldmVs SW5mbzoKLSAgICAgICAgICAgICAgICBsZXZlbCA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNvbnNv bGU6OkNoYW5uZWxMZXZlbDo6SW5mbzsKLSAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAg ICAgIGNhc2UgV1RGTG9nTGV2ZWxEZWJ1ZzoKLSAgICAgICAgICAgICAgICBsZXZlbCA9IEluc3Bl Y3Rvcjo6UHJvdG9jb2w6OkNvbnNvbGU6OkNoYW5uZWxMZXZlbDo6RGVidWc7CisgICAgICAgICAg ICAgICAgbGV2ZWwgPSBJbnNwZWN0b3I6OlByb3RvY29sOjpDb25zb2xlOjpDaGFubmVsTGV2ZWw6 OlZlcmJvc2U7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAg IH0KQEAgLTEwNSwxNSArOTksOSBAQCBzdGF0aWMgc3RkOjpvcHRpb25hbDxzdGQ6OnBhaXI8V1RG TG9nQ2hhCiAgICAgICAgIGxldmVsID0gV1RGTG9nTGV2ZWxFcnJvcjsKICAgICB9IGVsc2Ugewog ICAgICAgICBzdGF0ZSA9IFdURkxvZ0NoYW5uZWxPbjsKLSAgICAgICAgaWYgKGVxdWFsSWdub3Jp bmdBU0NJSUNhc2UobGV2ZWxTdHJpbmcsICJsb2ciKSkKLSAgICAgICAgICAgIGxldmVsID0gV1RG TG9nTGV2ZWxBbHdheXM7Ci0gICAgICAgIGVsc2UgaWYgKGVxdWFsSWdub3JpbmdBU0NJSUNhc2Uo bGV2ZWxTdHJpbmcsICJlcnJvciIpKQotICAgICAgICAgICAgbGV2ZWwgPSBXVEZMb2dMZXZlbEVy cm9yOwotICAgICAgICBlbHNlIGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKGxldmVsU3RyaW5n LCAid2FybmluZyIpKQorICAgICAgICBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShsZXZlbFN0 cmluZywgImJhc2ljIikpCiAgICAgICAgICAgICBsZXZlbCA9IFdURkxvZ0xldmVsV2FybmluZzsK LSAgICAgICAgZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShsZXZlbFN0cmluZywgImlu Zm8iKSkKLSAgICAgICAgICAgIGxldmVsID0gV1RGTG9nTGV2ZWxJbmZvOwotICAgICAgICBlbHNl IGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKGxldmVsU3RyaW5nLCAiZGVidWciKSkKKyAgICAg ICAgZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShsZXZlbFN0cmluZywgInZlcmJvc2Ui KSkKICAgICAgICAgICAgIGxldmVsID0gV1RGTG9nTGV2ZWxEZWJ1ZzsKICAgICAgICAgZWxzZQog ICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKSW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0 b3JVSS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5n ZUxvZwkocmV2aXNpb24gMjI1NTIxKQorKysgU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE3LTEyLTA3ICBFcmljIENhcmxz b24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFNpbXBsaWZ5IGxvZyBjaGFu bmVsIGNvbmZpZ3VyYXRpb24gVUkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE4MDUyNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzU5MDgzODI+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBMb2NhbGl6 YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogVXNlckludGVy ZmFjZS9Nb2RlbHMvTG9nZ2luZ0NoYW5uZWwuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuU2V0dGluZ3NUYWJD b250ZW50Vmlldy5wcm90b3R5cGUuX2NyZWF0ZUdlbmVyYWxTZXR0aW5nc1ZpZXcpOgorCiAyMDE3 LTEyLTA0ICBEZXZpbiBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IHByb3ZpZGUgbWV0aG9kIGZvciByZWNvcmRpbmcgQ2FudmFzUmVuZGVy aW5nQ29udGV4dDJEIGZyb20gSmF2YVNjcmlwdApJbmRleDogU291cmNlL1dlYkluc3BlY3RvclVJ L0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzCShyZXZpc2lvbiAyMjU1MjEpCisrKyBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9j YWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCSh3b3JraW5nIGNvcHkpCkBA IC0xMjgsNiArMTI4LDcgQEAgbG9jYWxpemVkU3RyaW5nc1siQXZlcmFnZSBUaW1lIl0gPSAiQXZl cgogbG9jYWxpemVkU3RyaW5nc1siQmFjayAoJXMpIl0gPSAiQmFjayAoJXMpIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIkJhY2tncm91bmQiXSA9ICJCYWNrZ3JvdW5kIjsKIGxvY2FsaXplZFN0cmluZ3Nb IkJhY2t0cmFjZSJdID0gIkJhY2t0cmFjZSI7Citsb2NhbGl6ZWRTdHJpbmdzWyJCYXNpYyJdID0g IkJhc2ljIjsKIGxvY2FsaXplZFN0cmluZ3NbIkJhc2lzIl0gPSAiQmFzaXMiOwogbG9jYWxpemVk U3RyaW5nc1siQmVhY29uIl0gPSAiQmVhY29uIjsKIGxvY2FsaXplZFN0cmluZ3NbIkJlYWNvbnMi XSA9ICJCZWFjb25zIjsKQEAgLTI3NCw3ICsyNzUsNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJEYXRh YmFzZSJdID0gIkRhdGFiYXNlCiBsb2NhbGl6ZWRTdHJpbmdzWyJEYXRhYmFzZSBubyBsb25nZXIg aGFzIGV4cGVjdGVkIHZlcnNpb24uIl0gPSAiRGF0YWJhc2Ugbm8gbG9uZ2VyIGhhcyBleHBlY3Rl ZCB2ZXJzaW9uLiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEYXRhYmFzZXMiXSA9ICJEYXRhYmFzZXMi OwogbG9jYWxpemVkU3RyaW5nc1siRGF0ZSJdID0gIkRhdGUiOwotbG9jYWxpemVkU3RyaW5nc1si RGVidWciXSA9ICJEZWJ1ZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEZWJ1ZzogIl0gPSAiRGVidWc6 ICI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEZWJ1Z2dlciJdID0gIkRlYnVnZ2VyIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIkRlYnVnZ2VyIFBhdXNlZCJdID0gIkRlYnVnZ2VyIFBhdXNlZCI7CkBAIC00OTgs NyArNDk4LDYgQEAgbG9jYWxpemVkU3RyaW5nc1siSW5kZW50IHdpZHRoOiJdID0gIkluZAogbG9j YWxpemVkU3RyaW5nc1siSW5kZXgiXSA9ICJJbmRleCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJJbmRl eCBLZXkgXHUyMDE0ICVzIl0gPSAiSW5kZXggS2V5IFx1MjAxNCAlcyI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJJbmRleGVkIERhdGFiYXNlcyJdID0gIkluZGV4ZWQgRGF0YWJhc2VzIjsKLWxvY2FsaXpl ZFN0cmluZ3NbIkluZm8iXSA9ICJJbmZvIjsKIGxvY2FsaXplZFN0cmluZ3NbIkluZm86ICJdID0g IkluZm86ICI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJJbmZvcyJdID0gIkluZm9zIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIkluaGVyaXRlZCBGcm9tOiAiXSA9ICJJbmhlcml0ZWQgRnJvbTogIjsKQEAgLTU1 NCw3ICs1NTMsNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJMb2NhbCBTdG9yYWdlIl0gPSAiTG9jCiBs b2NhbGl6ZWRTdHJpbmdzWyJMb2NhbCBWYXJpYWJsZXMiXSA9ICJMb2NhbCBWYXJpYWJsZXMiOwog bG9jYWxpemVkU3RyaW5nc1siTG9jYXRlZCBhdCAlcyJdID0gIkxvY2F0ZWQgYXQgJXMiOwogbG9j YWxpemVkU3RyaW5nc1siTG9jYXRpb24iXSA9ICJMb2NhdGlvbiI7Ci1sb2NhbGl6ZWRTdHJpbmdz WyJMb2ciXSA9ICJMb2ciOwogbG9jYWxpemVkU3RyaW5nc1siTG9nIENhbnZhcyBDb250ZXh0Il0g PSAiTG9nIENhbnZhcyBDb250ZXh0IjsKIGxvY2FsaXplZFN0cmluZ3NbIkxvZyBFbGVtZW50Il0g PSAiTG9nIEVsZW1lbnQiOwogbG9jYWxpemVkU3RyaW5nc1siTG9nIEZyYW1lIFRleHQiXSA9ICJM b2cgRnJhbWUgVGV4dCI7CkBAIC0xMDA0LDYgKzEwMDIsNyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJV c2luZyBwcmV2aW91cyBzZWxlY3RvCiBsb2NhbGl6ZWRTdHJpbmdzWyJWYWx1ZSJdID0gIlZhbHVl IjsKIGxvY2FsaXplZFN0cmluZ3NbIlZhcmlhYmxlcyJdID0gIlZhcmlhYmxlcyI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJWYXJpYW50cyJdID0gIlZhcmlhbnRzIjsKK2xvY2FsaXplZFN0cmluZ3NbIlZl cmJvc2UiXSA9ICJWZXJib3NlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlZlcnNpb24iXSA9ICJWZXJz aW9uIjsKIGxvY2FsaXplZFN0cmluZ3NbIlZlcnRleCJdID0gIlZlcnRleCI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJWZXJ0ZXggU2hhZGVyIl0gPSAiVmVydGV4IFNoYWRlciI7CkBAIC0xMDE2LDcgKzEw MTUsNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJWaXNpYmxlIl0gPSAiVmlzaWJsZSI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJXYWl0aW5nIl0gPSAiV2FpdGluZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJXYWl0 aW5nIGZvciBjYW52YXMgY29udGV4dHMgY3JlYXRlZCBieSBzY3JpcHQgb3IgQ1NTLiJdID0gIldh aXRpbmcgZm9yIGNhbnZhcyBjb250ZXh0cyBjcmVhdGVkIGJ5IHNjcmlwdCBvciBDU1MuIjsKIGxv Y2FsaXplZFN0cmluZ3NbIldhaXRpbmcgZm9yIGZyYW1lc+KApiJdID0gIldhaXRpbmcgZm9yIGZy YW1lc+KApiI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJXYXJuaW5nIl0gPSAiV2FybmluZyI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJXYXJuaW5nOiAiXSA9ICJXYXJuaW5nOiAiOwogbG9jYWxpemVkU3RyaW5n c1siV2FybmluZ3MiXSA9ICJXYXJuaW5ncyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJXYXRjaCBFeHBy ZXNzaW9ucyJdID0gIldhdGNoIEV4cHJlc3Npb25zIjsKSW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Mb2dnaW5nQ2hhbm5lbC5qcwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTG9nZ2luZ0NoYW5u ZWwuanMJKHJldmlzaW9uIDIyNTUyMSkKKysrIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL01vZGVscy9Mb2dnaW5nQ2hhbm5lbC5qcwkod29ya2luZyBjb3B5KQpAQCAtNTIsOSAr NTIsNiBAQCBXSS5Mb2dnaW5nQ2hhbm5lbCA9IGNsYXNzIExvZ2dpbmdDaGFubmVsCiAKIFdJLkxv Z2dpbmdDaGFubmVsLkxldmVsID0gewogICAgIE9mZjogIm9mZiIsCi0gICAgTG9nOiAibG9nIiwK LSAgICBFcnJvcjogImVycm9yIiwKLSAgICBXYXJuaW5nOiAid2FybmluZyIsCi0gICAgSW5mbzog ImluZm8iLAotICAgIERlYnVnOiAiZGVidWciLAorICAgIEJhc2ljOiAiYmFzaWMiLAorICAgIFZl cmJvc2U6ICJ2ZXJib3NlIiwKIH07CkluZGV4OiBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVu dFZpZXcuanMJKHJldmlzaW9uIDIyNTUyMSkKKysrIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMJKHdvcmtpbmcgY29weSkK QEAgLTIxNywxMSArMjE3LDggQEAgV0kuU2V0dGluZ3NUYWJDb250ZW50VmlldyA9IGNsYXNzIFNl dHRpbgogICAgICAgICBpZiAoV0kuTG9nTWFuYWdlci5zdXBwb3J0c0xvZ0NoYW5uZWxzKCkpIHsK ICAgICAgICAgICAgIGNvbnN0IGxvZ0xldmVscyA9IFsKICAgICAgICAgICAgICAgICBbV0kuTG9n Z2luZ0NoYW5uZWwuTGV2ZWwuT2ZmLCBXSS5VSVN0cmluZygiT2ZmIildLAotICAgICAgICAgICAg ICAgIFtXSS5Mb2dnaW5nQ2hhbm5lbC5MZXZlbC5Mb2csIFdJLlVJU3RyaW5nKCJMb2ciKV0sCi0g ICAgICAgICAgICAgICAgW1dJLkxvZ2dpbmdDaGFubmVsLkxldmVsLkVycm9yLCBXSS5VSVN0cmlu ZygiRXJyb3IiKV0sCi0gICAgICAgICAgICAgICAgW1dJLkxvZ2dpbmdDaGFubmVsLkxldmVsLldh cm5pbmcsIFdJLlVJU3RyaW5nKCJXYXJuaW5nIildLAotICAgICAgICAgICAgICAgIFtXSS5Mb2dn aW5nQ2hhbm5lbC5MZXZlbC5JbmZvLCBXSS5VSVN0cmluZygiSW5mbyIpXSwKLSAgICAgICAgICAg ICAgICBbV0kuTG9nZ2luZ0NoYW5uZWwuTGV2ZWwuRGVidWcsIFdJLlVJU3RyaW5nKCJEZWJ1ZyIp XSwKKyAgICAgICAgICAgICAgICBbV0kuTG9nZ2luZ0NoYW5uZWwuTGV2ZWwuQmFzaWMsIFdJLlVJ U3RyaW5nKCJCYXNpYyIpXSwKKyAgICAgICAgICAgICAgICBbV0kuTG9nZ2luZ0NoYW5uZWwuTGV2 ZWwuVmVyYm9zZSwgV0kuVUlTdHJpbmcoIlZlcmJvc2UiKV0sCiAgICAgICAgICAgICBdOwogICAg ICAgICAgICAgY29uc3QgZWRpdG9yTGFiZWxzID0gewogICAgICAgICAgICAgICAgIG1lZGlhOiBX SS5VSVN0cmluZygiTWVkaWEgTG9nZ2luZzoiKSwK 328760 2017-12-07 17:13:34 -0800 2017-12-07 17:53:35 -0800 Updated patch. simplify_menu_patch_3.txt text/plain 11869 eric.carlson SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjI1NjI1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDE3LTEyLTA3ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisg ICAgICAgIFNpbXBsaWZ5IGxvZyBjaGFubmVsIGNvbmZpZ3VyYXRpb24gVUkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MDUyNworICAgICAgICA8cmRh cjovL3Byb2JsZW0vMzU5MDgzODI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29y YXJvLgorCisgICAgICAgICogaW5zcGVjdG9yL3Byb3RvY29sL0NvbnNvbGUuanNvbjoKKwogMjAx Ny0xMi0wNiAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmYWN0 b3Jpbmc6IFJlbmFtZSBTY3JhbWJsZWRQdHIgdG8gUG9pc29uZWQuCkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL0NvbnNvbGUuanNvbgo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL0NvbnNvbGUuanNvbgko cmV2aXNpb24gMjI1NTIxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90 b2NvbC9Db25zb2xlLmpzb24JKHdvcmtpbmcgY29weSkKQEAgLTEyLDcgKzEyLDcgQEAKICAgICAg ICAgewogICAgICAgICAgICAgImlkIjogIkNoYW5uZWxMZXZlbCIsCiAgICAgICAgICAgICAidHlw ZSI6ICJzdHJpbmciLAotICAgICAgICAgICAgImVudW0iOiBbIm9mZiIsICJsb2ciLCAiZXJyb3Ii LCAid2FybmluZyIsICJpbmZvIiwgImRlYnVnIl0sCisgICAgICAgICAgICAiZW51bSI6IFsib2Zm IiwgImJhc2ljIiwgInZlcmJvc2UiXSwKICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJMZXZl bCBvZiBsb2dnaW5nLiIKICAgICAgICAgfSwKICAgICAgICAgewpJbmRleDogU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2 aXNpb24gMjI1NTIxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTcgQEAKKzIwMTctMTItMDcgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNv bkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxpZnkgbG9nIGNoYW5uZWwgY29uZmlndXJhdGlv biBVSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgw NTI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNTkwODM4Mj4KKworICAgICAgICBSZXZpZXdl ZCBieSBKb3NlcGggUGVjb3Jhcm8uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCB1cGRhdGVkIGV4 aXN0aW5nIHRlc3QuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvYWdlbnRzL1dlYkNvbnNvbGVBZ2Vu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb25zb2xlQWdlbnQ6OmdldExvZ2dpbmdDaGFu bmVscyk6CisgICAgICAgIChXZWJDb3JlOjpjaGFubmVsQ29uZmlndXJhdGlvbkZvclN0cmluZyk6 CisKIDIwMTctMTItMDUgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAg ICAgICA8dmlkZW8+IGFuZCBzY2FsZSgpIHRyYW5zZm9ybXMgeWllbGQgc2hydW5rIHNtYWxsIG9y IGNsaXBwZWQgY29udHJvbHMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMv V2ViQ29uc29sZUFnZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvYWdlbnRzL1dlYkNvbnNvbGVBZ2VudC5jcHAJKHJldmlzaW9uIDIyNTUyMSkKKysrIFNvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvV2ViQ29uc29sZUFnZW50LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNjYsMjMgKzY2LDE3IEBAIHZvaWQgV2ViQ29uc29sZUFnZW50OjpnZXRMb2dnaW5n Q2hhbm5lbHMKICAgICAgICAgaWYgKCFsb2dDaGFubmVsKQogICAgICAgICAgICAgcmV0dXJuOwog Ci0gICAgICAgIEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNvbnNvbGU6OkNoYW5uZWxMZXZlbCBsZXZl bCA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNvbnNvbGU6OkNoYW5uZWxMZXZlbDo6T2ZmOworICAg ICAgICBhdXRvIGxldmVsID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6Q29uc29sZTo6Q2hhbm5lbExl dmVsOjpPZmY7CiAgICAgICAgIGlmIChsb2dDaGFubmVsLT5zdGF0ZSAhPSBXVEZMb2dDaGFubmVs T2ZmKSB7CiAgICAgICAgICAgICBzd2l0Y2ggKGxvZ0NoYW5uZWwtPmxldmVsKSB7CiAgICAgICAg ICAgICBjYXNlIFdURkxvZ0xldmVsQWx3YXlzOgotICAgICAgICAgICAgICAgIGxldmVsID0gSW5z cGVjdG9yOjpQcm90b2NvbDo6Q29uc29sZTo6Q2hhbm5lbExldmVsOjpMb2c7Ci0gICAgICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNlIFdURkxvZ0xldmVsRXJyb3I6Ci0gICAgICAg ICAgICAgICAgbGV2ZWwgPSBJbnNwZWN0b3I6OlByb3RvY29sOjpDb25zb2xlOjpDaGFubmVsTGV2 ZWw6OkVycm9yOwotICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBXVEZM b2dMZXZlbFdhcm5pbmc6Ci0gICAgICAgICAgICAgICAgbGV2ZWwgPSBJbnNwZWN0b3I6OlByb3Rv Y29sOjpDb25zb2xlOjpDaGFubmVsTGV2ZWw6Oldhcm5pbmc7CisgICAgICAgICAgICAgICAgbGV2 ZWwgPSBJbnNwZWN0b3I6OlByb3RvY29sOjpDb25zb2xlOjpDaGFubmVsTGV2ZWw6OkJhc2ljOwog ICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBXVEZMb2dMZXZlbEluZm86 Ci0gICAgICAgICAgICAgICAgbGV2ZWwgPSBJbnNwZWN0b3I6OlByb3RvY29sOjpDb25zb2xlOjpD aGFubmVsTGV2ZWw6OkluZm87Ci0gICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBj YXNlIFdURkxvZ0xldmVsRGVidWc6Ci0gICAgICAgICAgICAgICAgbGV2ZWwgPSBJbnNwZWN0b3I6 OlByb3RvY29sOjpDb25zb2xlOjpDaGFubmVsTGV2ZWw6OkRlYnVnOworICAgICAgICAgICAgICAg IGxldmVsID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6Q29uc29sZTo6Q2hhbm5lbExldmVsOjpWZXJi b3NlOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAgICB9CkBA IC0xMDUsMTUgKzk5LDkgQEAgc3RhdGljIHN0ZDo6b3B0aW9uYWw8c3RkOjpwYWlyPFdURkxvZ0No YQogICAgICAgICBsZXZlbCA9IFdURkxvZ0xldmVsRXJyb3I7CiAgICAgfSBlbHNlIHsKICAgICAg ICAgc3RhdGUgPSBXVEZMb2dDaGFubmVsT247Ci0gICAgICAgIGlmIChlcXVhbElnbm9yaW5nQVND SUlDYXNlKGxldmVsU3RyaW5nLCAibG9nIikpCi0gICAgICAgICAgICBsZXZlbCA9IFdURkxvZ0xl dmVsQWx3YXlzOwotICAgICAgICBlbHNlIGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKGxldmVs U3RyaW5nLCAiZXJyb3IiKSkKLSAgICAgICAgICAgIGxldmVsID0gV1RGTG9nTGV2ZWxFcnJvcjsK LSAgICAgICAgZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShsZXZlbFN0cmluZywgIndh cm5pbmciKSkKKyAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdBU0NJSUNhc2UobGV2ZWxTdHJpbmcs ICJiYXNpYyIpKQogICAgICAgICAgICAgbGV2ZWwgPSBXVEZMb2dMZXZlbFdhcm5pbmc7Ci0gICAg ICAgIGVsc2UgaWYgKGVxdWFsSWdub3JpbmdBU0NJSUNhc2UobGV2ZWxTdHJpbmcsICJpbmZvIikp Ci0gICAgICAgICAgICBsZXZlbCA9IFdURkxvZ0xldmVsSW5mbzsKLSAgICAgICAgZWxzZSBpZiAo ZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShsZXZlbFN0cmluZywgImRlYnVnIikpCisgICAgICAgIGVs c2UgaWYgKGVxdWFsSWdub3JpbmdBU0NJSUNhc2UobGV2ZWxTdHJpbmcsICJ2ZXJib3NlIikpCiAg ICAgICAgICAgICBsZXZlbCA9IFdURkxvZ0xldmVsRGVidWc7CiAgICAgICAgIGVsc2UKICAgICAg ICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CkluZGV4OiBTb3VyY2UvV2ViSW5zcGVjdG9yVUkv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cJ KHJldmlzaW9uIDIyNTUyMSkKKysrIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAxNy0xMi0wNyAgRXJpYyBDYXJsc29uICA8 ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBTaW1wbGlmeSBsb2cgY2hhbm5lbCBj b25maWd1cmF0aW9uIFVJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xODA1MjcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM1OTA4MzgyPgorCisgICAg ICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAgICAgICAqIExvY2FsaXphdGlv bnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L01vZGVscy9Mb2dnaW5nQ2hhbm5lbC5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L1NldHRpbmdzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5TZXR0aW5nc1RhYkNvbnRl bnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlR2VuZXJhbFNldHRpbmdzVmlldyk6CisKIDIwMTctMTIt MDQgIERldmluIFJvdXNzbyAgPHdlYmtpdEBkZXZpbnJvdXNzby5jb20+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogcHJvdmlkZSBtZXRob2QgZm9yIHJlY29yZGluZyBDYW52YXNSZW5kZXJpbmdD b250ZXh0MkQgZnJvbSBKYXZhU2NyaXB0CkluZGV4OiBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9j YWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanMJKHJldmlzaW9uIDIyNTUyMSkKKysrIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6 YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMJKHdvcmtpbmcgY29weSkKQEAgLTEy OCw2ICsxMjgsNyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJBdmVyYWdlIFRpbWUiXSA9ICJBdmVyCiBs b2NhbGl6ZWRTdHJpbmdzWyJCYWNrICglcykiXSA9ICJCYWNrICglcykiOwogbG9jYWxpemVkU3Ry aW5nc1siQmFja2dyb3VuZCJdID0gIkJhY2tncm91bmQiOwogbG9jYWxpemVkU3RyaW5nc1siQmFj a3RyYWNlIl0gPSAiQmFja3RyYWNlIjsKK2xvY2FsaXplZFN0cmluZ3NbIkJhc2ljIl0gPSAiQmFz aWMiOwogbG9jYWxpemVkU3RyaW5nc1siQmFzaXMiXSA9ICJCYXNpcyI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJCZWFjb24iXSA9ICJCZWFjb24iOwogbG9jYWxpemVkU3RyaW5nc1siQmVhY29ucyJdID0g IkJlYWNvbnMiOwpAQCAtMjc0LDcgKzI3NSw2IEBAIGxvY2FsaXplZFN0cmluZ3NbIkRhdGFiYXNl Il0gPSAiRGF0YWJhc2UKIGxvY2FsaXplZFN0cmluZ3NbIkRhdGFiYXNlIG5vIGxvbmdlciBoYXMg ZXhwZWN0ZWQgdmVyc2lvbi4iXSA9ICJEYXRhYmFzZSBubyBsb25nZXIgaGFzIGV4cGVjdGVkIHZl cnNpb24uIjsKIGxvY2FsaXplZFN0cmluZ3NbIkRhdGFiYXNlcyJdID0gIkRhdGFiYXNlcyI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJEYXRlIl0gPSAiRGF0ZSI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJEZWJ1 ZyJdID0gIkRlYnVnIjsKIGxvY2FsaXplZFN0cmluZ3NbIkRlYnVnOiAiXSA9ICJEZWJ1ZzogIjsK IGxvY2FsaXplZFN0cmluZ3NbIkRlYnVnZ2VyIl0gPSAiRGVidWdnZXIiOwogbG9jYWxpemVkU3Ry aW5nc1siRGVidWdnZXIgUGF1c2VkIl0gPSAiRGVidWdnZXIgUGF1c2VkIjsKQEAgLTQ5OCw3ICs0 OTgsNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJJbmRlbnQgd2lkdGg6Il0gPSAiSW5kCiBsb2NhbGl6 ZWRTdHJpbmdzWyJJbmRleCJdID0gIkluZGV4IjsKIGxvY2FsaXplZFN0cmluZ3NbIkluZGV4IEtl eSBcdTIwMTQgJXMiXSA9ICJJbmRleCBLZXkgXHUyMDE0ICVzIjsKIGxvY2FsaXplZFN0cmluZ3Nb IkluZGV4ZWQgRGF0YWJhc2VzIl0gPSAiSW5kZXhlZCBEYXRhYmFzZXMiOwotbG9jYWxpemVkU3Ry aW5nc1siSW5mbyJdID0gIkluZm8iOwogbG9jYWxpemVkU3RyaW5nc1siSW5mbzogIl0gPSAiSW5m bzogIjsKIGxvY2FsaXplZFN0cmluZ3NbIkluZm9zIl0gPSAiSW5mb3MiOwogbG9jYWxpemVkU3Ry aW5nc1siSW5oZXJpdGVkIEZyb206ICJdID0gIkluaGVyaXRlZCBGcm9tOiAiOwpAQCAtNTU0LDcg KzU1Myw2IEBAIGxvY2FsaXplZFN0cmluZ3NbIkxvY2FsIFN0b3JhZ2UiXSA9ICJMb2MKIGxvY2Fs aXplZFN0cmluZ3NbIkxvY2FsIFZhcmlhYmxlcyJdID0gIkxvY2FsIFZhcmlhYmxlcyI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJMb2NhdGVkIGF0ICVzIl0gPSAiTG9jYXRlZCBhdCAlcyI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJMb2NhdGlvbiJdID0gIkxvY2F0aW9uIjsKLWxvY2FsaXplZFN0cmluZ3NbIkxv ZyJdID0gIkxvZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMb2cgQ2FudmFzIENvbnRleHQiXSA9ICJM b2cgQ2FudmFzIENvbnRleHQiOwogbG9jYWxpemVkU3RyaW5nc1siTG9nIEVsZW1lbnQiXSA9ICJM b2cgRWxlbWVudCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMb2cgRnJhbWUgVGV4dCJdID0gIkxvZyBG cmFtZSBUZXh0IjsKQEAgLTEwMDQsNiArMTAwMiw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIlVzaW5n IHByZXZpb3VzIHNlbGVjdG8KIGxvY2FsaXplZFN0cmluZ3NbIlZhbHVlIl0gPSAiVmFsdWUiOwog bG9jYWxpemVkU3RyaW5nc1siVmFyaWFibGVzIl0gPSAiVmFyaWFibGVzIjsKIGxvY2FsaXplZFN0 cmluZ3NbIlZhcmlhbnRzIl0gPSAiVmFyaWFudHMiOworbG9jYWxpemVkU3RyaW5nc1siVmVyYm9z ZSJdID0gIlZlcmJvc2UiOwogbG9jYWxpemVkU3RyaW5nc1siVmVyc2lvbiJdID0gIlZlcnNpb24i OwogbG9jYWxpemVkU3RyaW5nc1siVmVydGV4Il0gPSAiVmVydGV4IjsKIGxvY2FsaXplZFN0cmlu Z3NbIlZlcnRleCBTaGFkZXIiXSA9ICJWZXJ0ZXggU2hhZGVyIjsKQEAgLTEwMTYsNyArMTAxNSw2 IEBAIGxvY2FsaXplZFN0cmluZ3NbIlZpc2libGUiXSA9ICJWaXNpYmxlIjsKIGxvY2FsaXplZFN0 cmluZ3NbIldhaXRpbmciXSA9ICJXYWl0aW5nIjsKIGxvY2FsaXplZFN0cmluZ3NbIldhaXRpbmcg Zm9yIGNhbnZhcyBjb250ZXh0cyBjcmVhdGVkIGJ5IHNjcmlwdCBvciBDU1MuIl0gPSAiV2FpdGlu ZyBmb3IgY2FudmFzIGNvbnRleHRzIGNyZWF0ZWQgYnkgc2NyaXB0IG9yIENTUy4iOwogbG9jYWxp emVkU3RyaW5nc1siV2FpdGluZyBmb3IgZnJhbWVz4oCmIl0gPSAiV2FpdGluZyBmb3IgZnJhbWVz 4oCmIjsKLWxvY2FsaXplZFN0cmluZ3NbIldhcm5pbmciXSA9ICJXYXJuaW5nIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIldhcm5pbmc6ICJdID0gIldhcm5pbmc6ICI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJX YXJuaW5ncyJdID0gIldhcm5pbmdzIjsKIGxvY2FsaXplZFN0cmluZ3NbIldhdGNoIEV4cHJlc3Np b25zIl0gPSAiV2F0Y2ggRXhwcmVzc2lvbnMiOwpJbmRleDogU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL0xvZ2dpbmdDaGFubmVsLmpzCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Mb2dnaW5nQ2hhbm5lbC5q cwkocmV2aXNpb24gMjI1NTIxKQorKysgU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTW9kZWxzL0xvZ2dpbmdDaGFubmVsLmpzCSh3b3JraW5nIGNvcHkpCkBAIC01Miw5ICs1Miw2 IEBAIFdJLkxvZ2dpbmdDaGFubmVsID0gY2xhc3MgTG9nZ2luZ0NoYW5uZWwKIAogV0kuTG9nZ2lu Z0NoYW5uZWwuTGV2ZWwgPSB7CiAgICAgT2ZmOiAib2ZmIiwKLSAgICBMb2c6ICJsb2ciLAotICAg IEVycm9yOiAiZXJyb3IiLAotICAgIFdhcm5pbmc6ICJ3YXJuaW5nIiwKLSAgICBJbmZvOiAiaW5m byIsCi0gICAgRGVidWc6ICJkZWJ1ZyIsCisgICAgQmFzaWM6ICJiYXNpYyIsCisgICAgVmVyYm9z ZTogInZlcmJvc2UiLAogfTsKSW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmll dy5qcwkocmV2aXNpb24gMjI1NTIxKQorKysgU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwkod29ya2luZyBjb3B5KQpAQCAt MjE3LDExICsyMTcsOCBAQCBXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGlu CiAgICAgICAgIGlmIChXSS5Mb2dNYW5hZ2VyLnN1cHBvcnRzTG9nQ2hhbm5lbHMoKSkgewogICAg ICAgICAgICAgY29uc3QgbG9nTGV2ZWxzID0gWwogICAgICAgICAgICAgICAgIFtXSS5Mb2dnaW5n Q2hhbm5lbC5MZXZlbC5PZmYsIFdJLlVJU3RyaW5nKCJPZmYiKV0sCi0gICAgICAgICAgICAgICAg W1dJLkxvZ2dpbmdDaGFubmVsLkxldmVsLkxvZywgV0kuVUlTdHJpbmcoIkxvZyIpXSwKLSAgICAg ICAgICAgICAgICBbV0kuTG9nZ2luZ0NoYW5uZWwuTGV2ZWwuRXJyb3IsIFdJLlVJU3RyaW5nKCJF cnJvciIpXSwKLSAgICAgICAgICAgICAgICBbV0kuTG9nZ2luZ0NoYW5uZWwuTGV2ZWwuV2Fybmlu ZywgV0kuVUlTdHJpbmcoIldhcm5pbmciKV0sCi0gICAgICAgICAgICAgICAgW1dJLkxvZ2dpbmdD aGFubmVsLkxldmVsLkluZm8sIFdJLlVJU3RyaW5nKCJJbmZvIildLAotICAgICAgICAgICAgICAg IFtXSS5Mb2dnaW5nQ2hhbm5lbC5MZXZlbC5EZWJ1ZywgV0kuVUlTdHJpbmcoIkRlYnVnIildLAor ICAgICAgICAgICAgICAgIFtXSS5Mb2dnaW5nQ2hhbm5lbC5MZXZlbC5CYXNpYywgV0kuVUlTdHJp bmcoIkJhc2ljIildLAorICAgICAgICAgICAgICAgIFtXSS5Mb2dnaW5nQ2hhbm5lbC5MZXZlbC5W ZXJib3NlLCBXSS5VSVN0cmluZygiVmVyYm9zZSIpXSwKICAgICAgICAgICAgIF07CiAgICAgICAg ICAgICBjb25zdCBlZGl0b3JMYWJlbHMgPSB7CiAgICAgICAgICAgICAgICAgbWVkaWE6IFdJLlVJ U3RyaW5nKCJNZWRpYSBMb2dnaW5nOiIpLApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMjI1NTIxKQorKysg TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTctMTItMDcgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAg ICAgU2ltcGxpZnkgbG9nIGNoYW5uZWwgY29uZmlndXJhdGlvbiBVSQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgwNTI3CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8zNTkwODM4Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBKb3NlcGggUGVjb3Jhcm8u CisKKyAgICAgICAgKiBpbnNwZWN0b3IvY29uc29sZS93ZWJjb3JlLWxvZ2dpbmcuaHRtbDogVXBk YXRlZCB0ZXN0IGZvciBuZXcgcmVzdWx0cy4KKwogMjAxNy0xMi0wNSAgWmFuIERvYmVyc2VrICA8 emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBXUEUgZ2FyZGVuaW5n LiBSZWJhc2VsaW5lIGEgcXVpbnRldCBvZiBTVkcgdGVzdHMuCkluZGV4OiBMYXlvdXRUZXN0cy9p bnNwZWN0b3IvY29uc29sZS93ZWJjb3JlLWxvZ2dpbmcuaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS93ZWJjb3JlLWxvZ2dpbmcuaHRtbAkocmV2aXNpb24g MjI1NTIxKQorKysgTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvd2ViY29yZS1sb2dnaW5n Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTEyNiw3ICsxMjYsNyBAQCBmdW5jdGlvbiB0ZXN0KCkK ICAgICAgICAgICAgIGxldCBjaGFubmVsID0gV0kubG9nTWFuYWdlci5jdXN0b21Mb2dnaW5nQ2hh bm5lbHMuZmluZChjaGFubmVsID0+IGNoYW5uZWwuc291cmNlID09PSBXSS5Db25zb2xlTWVzc2Fn ZS5NZXNzYWdlU291cmNlLk1lZGlhKTsKICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0 VGhhdChjaGFubmVsLmxldmVsID09PSBXSS5Mb2dnaW5nQ2hhbm5lbC5MZXZlbC5PZmYsICJNZWRp YSBsb2dnaW5nIGRpc2FibGVkLiIpOwogCi0gICAgICAgICAgICBDb25zb2xlQWdlbnQuc2V0TG9n Z2luZ0NoYW5uZWxMZXZlbChjaGFubmVsLnNvdXJjZSwgV0kuTG9nZ2luZ0NoYW5uZWwuTGV2ZWwu TG9nKQorICAgICAgICAgICAgQ29uc29sZUFnZW50LnNldExvZ2dpbmdDaGFubmVsTGV2ZWwoY2hh bm5lbC5zb3VyY2UsIFdJLkxvZ2dpbmdDaGFubmVsLkxldmVsLkJhc2ljKQogICAgICAgICAgICAg Q29uc29sZUFnZW50LmdldExvZ2dpbmdDaGFubmVscygoZXJyb3IsIGNoYW5uZWxzKSA9PiB7CiAg ICAgICAgICAgICAgICAgaWYgKGVycm9yKSB7CiAgICAgICAgICAgICAgICAgICAgIEluc3BlY3Rv clRlc3QuZmFpbChgQ29uc29sZUFnZW50LmdldExvZ2dpbmdDaGFubmVscygpIGZhaWxlZCB3aXRo IGVycm9yICR7ZXJyb3J9YCk7CkBAIC0xMzQsNyArMTM0LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgbGV0IG1lZGlh Q2hhbm5lbCA9IGNoYW5uZWxzLmZpbmQoY2hhbm5lbCA9PiBjaGFubmVsLnNvdXJjZSA9PT0gV0ku Q29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5NZWRpYSk7Ci0gICAgICAgICAgICAgICAgSW5z cGVjdG9yVGVzdC5leHBlY3RUaGF0KG1lZGlhQ2hhbm5lbC5sZXZlbCA9PT0gV0kuTG9nZ2luZ0No YW5uZWwuTGV2ZWwuTG9nLCAiTWVkaWEgbG9nZ2luZyBoYXMgYmVlbiBlbmFibGVkLiIpOworICAg ICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChtZWRpYUNoYW5uZWwubGV2ZWwg PT09IFdJLkxvZ2dpbmdDaGFubmVsLkxldmVsLkJhc2ljLCAiTWVkaWEgbG9nZ2luZyBoYXMgYmVl biBlbmFibGVkLiIpOwogCiAgICAgICAgICAgICAgICAgbGV0IGxvZ0xpc3RlbmVyID0gV0kubG9n TWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLkxvZ01hbmFnZXIuRXZlbnQuTWVzc2FnZUFkZGVk LCAoZXZlbnQpID0+IHsKICAgICAgICAgICAgICAgICAgICAgbGV0IG1lc3NhZ2UgPSBldmVudC5k YXRhLm1lc3NhZ2U7Cg==