68250 2011-09-16 09:35:34 -0700 Web Inspector: limit the use of "Resource" term in the protocol. 2011-09-21 04:44:41 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy vsevik yurys oldest_to_newest 468540 0 pfeldman 2011-09-16 09:35:34 -0700 Patch to follow. 468544 1 107667 pfeldman 2011-09-16 09:38:12 -0700 Created attachment 107667 Patch 470006 2 107667 vsevik 2011-09-20 05:56:17 -0700 Comment on attachment 107667 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=107667&action=review > Source/WebCore/inspector/Inspector.json:76 > + { "name": "loaderId", "$ref": "Network.LoaderId", "description": "Identifier of the loader associated with this frame." }, How is that related to the bug description? > Source/WebCore/inspector/Inspector.json:351 > + { "name": "stackTrace", "$ref": "StackTrace", "optional": true, "description": "JavaScript stack trace for assertions and error messages." } And that? > Source/WebCore/inspector/Inspector.json:428 > + "description": "Network domain allows tracking network activities of the page. It exposes information about HTTP requests and responses, their headers, bodies, timing, etc.", It also exposes information about FTP, WebSocket, file:// and other types of activities. I think this descriptin is confusing. 470043 3 107667 pfeldman 2011-09-20 07:08:07 -0700 Comment on attachment 107667 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=107667&action=review >> Source/WebCore/inspector/Inspector.json:76 >> + { "name": "loaderId", "$ref": "Network.LoaderId", "description": "Identifier of the loader associated with this frame." }, > > How is that related to the bug description? Drive-by making loaderId strong-typed. >> Source/WebCore/inspector/Inspector.json:351 >> + { "name": "stackTrace", "$ref": "StackTrace", "optional": true, "description": "JavaScript stack trace for assertions and error messages." } > > And that? Drive-by fix. >> Source/WebCore/inspector/Inspector.json:428 >> + "description": "Network domain allows tracking network activities of the page. It exposes information about HTTP requests and responses, their headers, bodies, timing, etc.", > > It also exposes information about FTP, WebSocket, file:// and other types of activities. I think this descriptin is confusing. Fixed. 470047 4 107997 pfeldman 2011-09-20 07:12:29 -0700 Created attachment 107997 Patch 470053 5 vsevik 2011-09-20 07:22:54 -0700 Looks good. 470711 6 pfeldman 2011-09-21 04:44:41 -0700 Committed r95613: <http://trac.webkit.org/changeset/95613> 107667 2011-09-16 09:38:12 -0700 2011-09-20 07:12:21 -0700 Patch bug-68250-20110916203810.patch text/plain 21018 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTUyODMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmNjA0YTc0NmYwZmM3ZTY4 ZDdiOGMyMzZhYzc1MDM1OTRmZDZkNTkxLi4zNjA1OGI3ZmMyNDU1M2UxMGI0ZDgyZTRhY2QyNzM3 MDRkYzIwZTU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDktMTYgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IGxpbWl0IHRoZSB1c2Ugb2YgIlJlc291cmNlIiB0ZXJtIGluIHRoZSBwcm90b2NvbC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MjUwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6bWFya1Jlc291 cmNlQXNDYWNoZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6 ZGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvclJlc291cmNlQWdlbnQ6OnNldEV4dHJhSFRUUEhlYWRlcnMpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6Z2V0UmVzcG9uc2VCb2R5KToKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4dGVu c2lvblNlcnZlci5wcm90b3R5cGUuX29uQWRkUmVxdWVzdEhlYWRlcnMpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuTmV0d29ya01hbmFnZXIucHJvdG90eXBlLnJlcXVlc3RDb250ZW50KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUucmVxdWVzdFNlcnZlZEZyb21D YWNoZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBl LnJlcXVlc3RTZXJ2ZWRGcm9tTWVtb3J5Q2FjaGUpOgorCiAyMDExLTA5LTE1ICBQYXZlbCBGZWxk bWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZW5h bWUgQ29uc29sZS5jbGVhckNvbnNvbGVNZXNzYWdlcyB0byBDb25zb2xlLmNsZWFyTWVzc2FnZXMs IGJydXNoIHVwIGNvbnNvbGUgZG9tYWluIGRvYy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3IuanNvbgppbmRleCBhOTM3NzUxNDk1YTI0MTYyMTMwMzdiZmQzMDlhNTFiNmY4MDczYWZj Li4yNWEyOWYzMGQ2N2RhNTZhZjg3NDZjOWE2M2M5NWI5MmU1N2M5YjQ5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC03Myw3ICs3Myw3IEBACiAgICAgICAgICAg ICAgICAgInByb3BlcnRpZXMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaWQi LCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiRnJhbWUgdW5pcXVlIGlkZW50aWZp ZXIuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInBhcmVudElkIiwgInR5cGUi OiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlBhcmVudCBmcmFt ZSBpZGVudGlmaWVyLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJsb2FkZXJJ ZCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSBs b2FkZXIgYXNzb2NpYXRlZCB3aXRoIHRoaXMgZnJhbWUuIiB9LAorICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImxvYWRlcklkIiwgIiRyZWYiOiAiTmV0d29yay5Mb2FkZXJJZCIsICJkZXNj cmlwdGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSBsb2FkZXIgYXNzb2NpYXRlZCB3aXRoIHRoaXMg ZnJhbWUuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5hbWUiLCAidHlwZSI6 ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiRnJhbWUncyBuYW1l IGFzIHNwZWNpZmllZCBpbiB0aGUgdGFnLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJ1cmwiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiRnJhbWUgZG9jdW1l bnQncyBVUkwuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm1pbWVUeXBlIiwg InR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkZyYW1lIGRvY3VtZW50J3MgbWltZVR5 cGUgYXMgZGV0ZXJtaW5lZCBieSB0aGUgYnJvd3Nlci4iIH0KQEAgLTIxMSw3ICsyMTEsNyBAQAog ICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlZCBvbmNlIG5hdmlnYXRpb24gb2Yg dGhlIGZyYW1lIGhhcyBjb21wbGV0ZWQuIEZyYW1lIGlzIG5vdyBhc3NvY2lhdGVkIHdpdGggdGhl IG5ldyBsb2FkZXIuIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJmcmFtZSIsICIkcmVmIjogIkZyYW1lIiwgImRlc2NyaXB0 aW9uIjogIkZyYW1lIG9iamVjdC4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi bG9hZGVySWQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiTG9hZGVyIGlkZW50 aWZpZXIuIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibG9hZGVySWQiLCAiJHJl ZiI6ICJOZXR3b3JrLkxvYWRlcklkIiwgImRlc2NyaXB0aW9uIjogIkxvYWRlciBpZGVudGlmaWVy LiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgImhpZGRlbiI6IHRydWUK ICAgICAgICAgICAgIH0sCkBAIC0zNDgsNyArMzQ4LDcgQEAKICAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJ0ZXh0IiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIk1lc3Nh Z2UgdGV4dC4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibmV0d29ya1JlcXVl c3RJZCIsICIkcmVmIjogIk5ldHdvcmsuUmVxdWVzdElkIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRl c2NyaXB0aW9uIjogIklkZW50aWZpZXIgb2YgdGhlIG5ldHdvcmsgcmVxdWVzdCBhc3NvY2lhdGVk IHdpdGggdGhpcyBtZXNzYWdlLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJw YXJhbWV0ZXJzIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIjogIlJ1bnRpbWUu UmVtb3RlT2JqZWN0IiB9LCAiZGVzY3JpcHRpb24iOiAiTWVzc2FnZSBwYXJhbWV0ZXJzIGluIGNh c2Ugb2YgdGhlIGZvcm1hdHRlZCBtZXNzYWdlLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJzdGFja1RyYWNlIiwgIiRyZWYiOiAiU3RhY2tUcmFjZSIsICJkZXNjcmlwdGlvbiI6 ICJKYXZhU2NyaXB0IHN0YWNrIHRyYWNlIGZvciBhc3NlcnRpb25zIGFuZCBlcnJvciBtZXNzYWdl cy4iIH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdGFja1RyYWNlIiwgIiRyZWYi OiAiU3RhY2tUcmFjZSIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJKYXZhU2Ny aXB0IHN0YWNrIHRyYWNlIGZvciBhc3NlcnRpb25zIGFuZCBlcnJvciBtZXNzYWdlcy4iIH0KICAg ICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewpAQCAtNDI1LDkg KzQyNSwxNCBAQAogICAgIH0sCiAgICAgewogICAgICAgICAiZG9tYWluIjogIk5ldHdvcmsiLAot ICAgICAgICAiZGVzY3JpcHRpb24iOiAiTmV0d29yayBkb21haW4gYWxsb3dzIHRyYWNraW5nIG5l dHdvcmsgYWN0aXZpdGllcyBvZiB0aGUgcGFnZS4gSXQgZXhwb3NlcyBpbmZvcm1hdGlvbiBhYm91 dCBIVFRQIGFuZCBXZWJTb2NrZXQgcmVxdWVzdHMgYW5kIHJlc3BvbnNlcywgdGhlaXIgaGVhZGVy cywgYm9kaWVzLCB0aW1pbmcsIGV0Yy4gSXQgYWxzbyBhbGxvd3MgZ2V0dGluZyB0aGUgdHJlZSBv ZiB0aGUgRnJhbWVzIG9uIHRoZSBwYWdlIGFsb25nIHdpdGggaW5mb3JtYXRpb24gYWJvdXQgdGhl aXIgcmVzb3VyY2VzLiIsCisgICAgICAgICJkZXNjcmlwdGlvbiI6ICJOZXR3b3JrIGRvbWFpbiBh bGxvd3MgdHJhY2tpbmcgbmV0d29yayBhY3Rpdml0aWVzIG9mIHRoZSBwYWdlLiBJdCBleHBvc2Vz IGluZm9ybWF0aW9uIGFib3V0IEhUVFAgcmVxdWVzdHMgYW5kIHJlc3BvbnNlcywgdGhlaXIgaGVh ZGVycywgYm9kaWVzLCB0aW1pbmcsIGV0Yy4iLAogICAgICAgICAidHlwZXMiOiBbCiAgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgImlkIjogIkxvYWRlcklkIiwKKyAgICAgICAgICAgICAg ICAidHlwZSI6ICJzdHJpbmciLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJVbmlx dWUgbG9hZGVyIGlkZW50aWZpZXIuIgorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKICAg ICAgICAgICAgICAgICAiaWQiOiAiUmVxdWVzdElkIiwKICAgICAgICAgICAgICAgICAidHlwZSI6 ICJzdHJpbmciLAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJVbmlxdWUgcmVxdWVz dCBpZGVudGlmaWVyLiIKQEAgLTQ1Miw3ICs0NTcsNyBAQAogICAgICAgICAgICAgICAgIF0KICAg ICAgICAgICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgImlkIjogIlJlc291 cmNlUmVxdWVzdCIsCisgICAgICAgICAgICAgICAgImlkIjogIlJlcXVlc3QiLAogICAgICAgICAg ICAgICAgICJ0eXBlIjogIm9iamVjdCIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjog IkhUVFAgcmVxdWVzdCBkYXRhLiIsCiAgICAgICAgICAgICAgICAgInByb3BlcnRpZXMiOiBbCkBA IC00NjMsNyArNDY4LDcgQEAKICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAg ICAgICAgICAgewotICAgICAgICAgICAgICAgICJpZCI6ICJSZXNvdXJjZVJlc3BvbnNlIiwKKyAg ICAgICAgICAgICAgICAiaWQiOiAiUmVzcG9uc2UiLAogICAgICAgICAgICAgICAgICJ0eXBlIjog Im9iamVjdCIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkhUVFAgcmVzcG9uc2Ug ZGF0YS4iLAogICAgICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogWwpAQCAtNDc3LDcgKzQ4Miw3 IEBACiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVxdWVzdEhlYWRlcnNUZXh0Iiwg InR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkhUVFAg cmVxdWVzdCBoZWFkZXJzIHRleHQuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog ImNvbm5lY3Rpb25SZXVzZWQiLCAidHlwZSI6ICJib29sZWFuIiwgImRlc2NyaXB0aW9uIjogIlNw ZWNpZmllcyB3aGV0aGVyIHBoeXNpY2FsIGNvbm5lY3Rpb24gd2FzIGFjdHVhbGx5IHJldXNlZCBm b3IgdGhpcyByZXF1ZXN0LiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjb25u ZWN0aW9uSWQiLCAidHlwZSI6ICJudW1iZXIiLCAiZGVzY3JpcHRpb24iOiAiUGh5c2ljYWwgY29u bmVjdGlvbiBpZCB0aGF0IHdhcyBhY3R1YWxseSB1c2VkIGZvciB0aGlzIHJlcXVlc3QuIiB9LAot ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImZyb21EaXNrQ2FjaGUiLCAidHlwZSI6ICJi b29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlNwZWNpZmllcyB0aGF0 IHRoZSByZXNvdXJjZSB3YXMgbG9hZGVkIGZyb20gdGhlIGRpc2sgY2FjaGUuIiB9LAorICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogImZyb21EaXNrQ2FjaGUiLCAidHlwZSI6ICJib29sZWFu IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlNwZWNpZmllcyB0aGF0IHRoZSBy ZXF1ZXN0IHdhcyBzZXJ2ZWQgZnJvbSB0aGUgZGlzayBjYWNoZS4iIH0sCiAgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAidGltaW5nIiwgIiRyZWYiOiAiUmVzb3VyY2VUaW1pbmciLCAib3B0 aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVGltaW5nIGluZm9ybWF0aW9uIGZvciB0aGUg Z2l2ZW4gcmVxdWVzdC4iIH0KICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LApAQCAt NDg4LDE0ICs0OTMsMTQgQEAKICAgICAgICAgICAgICAgICAicHJvcGVydGllcyI6IFsKICAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ1cmwiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3Jp cHRpb24iOiAiUmVzb3VyY2UgVVJMLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJ0eXBlIiwgIiRyZWYiOiAiUGFnZS5SZXNvdXJjZVR5cGUiLCAiZGVzY3JpcHRpb24iOiAiVHlw ZSBvZiB0aGlzIHJlc291cmNlLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJy ZXNwb25zZSIsICIkcmVmIjogIlJlc291cmNlUmVzcG9uc2UiLCAiZGVzY3JpcHRpb24iOiAiQ2Fj aGVkIHJlc3BvbnNlIGRhdGEuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJl c3BvbnNlIiwgIiRyZWYiOiAiUmVzcG9uc2UiLCAiZGVzY3JpcHRpb24iOiAiQ2FjaGVkIHJlc3Bv bnNlIGRhdGEuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImJvZHlTaXplIiwg InR5cGUiOiAibnVtYmVyIiwgImRlc2NyaXB0aW9uIjogIkNhY2hlZCByZXNwb25zZSBib2R5IHNp emUuIiB9CiAgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsK ICAgICAgICAgICAgICAgICAiaWQiOiAiSW5pdGlhdG9yIiwKICAgICAgICAgICAgICAgICAidHlw ZSI6ICJvYmplY3QiLAotICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJJbmZvcm1hdGlv biBhYm91dCB0aGUgcmVzb3VyY2UgbG9hZCBpbml0aWF0b3IuIiwKKyAgICAgICAgICAgICAgICAi ZGVzY3JpcHRpb24iOiAiSW5mb3JtYXRpb24gYWJvdXQgdGhlIHJlcXVlc3QgaW5pdGlhdG9yLiIs CiAgICAgICAgICAgICAgICAgInByb3BlcnRpZXMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAidHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJlbnVtIjogWyJwYXJzZXIiLCAic2Ny aXB0IiwgIm90aGVyIl0sICJkZXNjcmlwdGlvbiI6ICJUeXBlIG9mIHRoaXMgaW5pdGlhdG9yLiIg fSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdGFja1RyYWNlIiwgIiRyZWYiOiAi Q29uc29sZS5TdGFja1RyYWNlIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIklu aXRpYXRvciBKYXZhU2NyaXB0IHN0YWNrIHRyYWNlLCBzZXQgZm9yIFNjcmlwdCBvbmx5LiIgfSwK QEAgLTUyMSwyMCArNTI2LDIwIEBACiAgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwK ICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6ICJzZXRFeHRyYUhlYWRlcnMi LAorICAgICAgICAgICAgICAgICJuYW1lIjogInNldEV4dHJhSFRUUEhlYWRlcnMiLAogICAgICAg ICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJBbGxvd3Mgc2VuZGluZyBleHRyYSBIVFRQIGhlYWRl cnMgd2l0aCB0aGUgcmVxdWVzdHMgZnJvbSB0aGlzIHBhZ2UuIiwKICAgICAgICAgICAgICAgICAi cGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJoZWFkZXJzIiwg InR5cGUiOiAib2JqZWN0IiwgImRlc2NyaXB0aW9uIjogIk1hcCB3aXRoIGV4dHJhIEhUVFAgaGVh ZGVycy4iIH0KICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAg ewotICAgICAgICAgICAgICAgICJuYW1lIjogImdldFJlc291cmNlQ29udGVudCIsCi0gICAgICAg ICAgICAgICAgImRlc2NyaXB0aW9uIjogIlJldHVybnMgY29udGVudCBvZiB0aGUgZ2l2ZW4gcmVz b3VyY2UuIiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJnZXRSZXNwb25zZUJvZHkiLAorICAg ICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJSZXR1cm5zIGNvbnRlbnQgc2VydmVkIGZvciB0 aGUgZ2l2ZW4gcmVxdWVzdC4iLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJlcXVlc3RJZCIsICIkcmVmIjogIlJlcXVlc3RJ ZCIsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSBuZXR3b3JrIHJlcXVlc3QgdG8g Z2V0IGNvbnRlbnQgZm9yLiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAg InJldHVybnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29udGVudCIsICJ0 eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJSZXNvdXJjZSBjb250ZW50LiIgfSwKKyAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJib2R5IiwgInR5cGUiOiAic3RyaW5nIiwgImRl c2NyaXB0aW9uIjogIlJlc3BvbnNlIGJvZHkuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJu YW1lIjogImJhc2U2NEVuY29kZWQiLCAidHlwZSI6ICJib29sZWFuIiwgImRlc2NyaXB0aW9uIjog IlRydWUsIGlmIGNvbnRlbnQgd2FzIHNlcnZlZCBhcyBiYXNlNjQuIiB9CiAgICAgICAgICAgICAg ICAgXQogICAgICAgICAgICAgfSwKQEAgLTU2MSwxOCArNTY2LDE4IEBACiAgICAgICAgICAgICAg ICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVxdWVz dElkIiwgIiRyZWYiOiAiUmVxdWVzdElkIiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3QgaWRlbnRp Zmllci4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZnJhbWVJZCIsICJ0eXBl IjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJGcmFtZSBpZGVudGlmaWVyLiIsICJoaWRkZW4i OiB0cnVlIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibG9hZGVySWQiLCAidHlw ZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiTG9hZGVyIGlkZW50aWZpZXIuIiB9LAotICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImRvY3VtZW50VVJMIiwgInR5cGUiOiAic3RyaW5n IiwgImRlc2NyaXB0aW9uIjogIlVSTCBvZiB0aGUgZG9jdW1lbnQgdGhpcyByZXNvdXJjZSBpcyBs b2FkZWQgZm9yLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXF1ZXN0Iiwg IiRyZWYiOiAiUmVzb3VyY2VSZXF1ZXN0IiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3QgZGF0YS4i IH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibG9hZGVySWQiLCAiJHJlZiI6ICJM b2FkZXJJZCIsICJkZXNjcmlwdGlvbiI6ICJMb2FkZXIgaWRlbnRpZmllci4iIH0sCisgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAiZG9jdW1lbnRVUkwiLCAidHlwZSI6ICJzdHJpbmciLCAi ZGVzY3JpcHRpb24iOiAiVVJMIG9mIHRoZSBkb2N1bWVudCB0aGlzIHJlcXVlc3QgaXMgbG9hZGVk IGZvci4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVxdWVzdCIsICIkcmVm IjogIlJlcXVlc3QiLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBkYXRhLiIgfSwKICAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJ0aW1lc3RhbXAiLCAidHlwZSI6ICJudW1iZXIiLCAiZGVz Y3JpcHRpb24iOiAiVGltZXN0YW1wLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJpbml0aWF0b3IiLCAiJHJlZiI6ICJJbml0aWF0b3IiLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVz dCBpbml0aWF0b3IuIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN0YWNrVHJh Y2UiLCAiJHJlZiI6ICJDb25zb2xlLlN0YWNrVHJhY2UiLCAiZGVzY3JpcHRpb24iOiAiSmF2YVNj cmlwdCBzdGFjayB0cmFjZSB1cG9uIGlzc3VpbmcgdGhpcyByZXF1ZXN0LiIgfSwKLSAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJyZWRpcmVjdFJlc3BvbnNlIiwgIm9wdGlvbmFsIjogdHJ1 ZSwgIiRyZWYiOiAiUmVzb3VyY2VSZXNwb25zZSIsICJkZXNjcmlwdGlvbiI6ICJSZWRpcmVjdCBy ZXNwb25zZSBkYXRhLiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN0YWNrVHJh Y2UiLCAiJHJlZiI6ICJDb25zb2xlLlN0YWNrVHJhY2UiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVz Y3JpcHRpb24iOiAiSmF2YVNjcmlwdCBzdGFjayB0cmFjZSB1cG9uIGlzc3VpbmcgdGhpcyByZXF1 ZXN0LiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZWRpcmVjdFJlc3BvbnNl IiwgIm9wdGlvbmFsIjogdHJ1ZSwgIiRyZWYiOiAiUmVzcG9uc2UiLCAiZGVzY3JpcHRpb24iOiAi UmVkaXJlY3QgcmVzcG9uc2UgZGF0YS4iIH0KICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAg ICB9LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogInJlc291cmNlTWFy a2VkQXNDYWNoZWQiLAotICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlZCB3aGVu IHJlcXVlc3QgaXMga25vd24gdG8gYmUgc2VydmVkIGZyb20gZGlzayBjYWNoZS4iLAorICAgICAg ICAgICAgICAgICJuYW1lIjogInJlcXVlc3RTZXJ2ZWRGcm9tQ2FjaGUiLAorICAgICAgICAgICAg ICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlZCBpZiByZXF1ZXN0IGVuZGVkIHVwIGxvYWRpbmcgZnJv bSBjYWNoZS4iLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInJlcXVlc3RJZCIsICIkcmVmIjogIlJlcXVlc3RJZCIsICJkZXNj cmlwdGlvbiI6ICJSZXF1ZXN0IGlkZW50aWZpZXIuIiB9CiAgICAgICAgICAgICAgICAgXQpAQCAt NTg0LDcgKzU4OSw3IEBACiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVxdWVzdElk IiwgIiRyZWYiOiAiUmVxdWVzdElkIiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3QgaWRlbnRpZmll ci4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGltZXN0YW1wIiwgInR5cGUi OiAibnVtYmVyIiwgImRlc2NyaXB0aW9uIjogIlRpbWVzdGFtcC4iIH0sCiAgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICIkcmVmIjogIlBhZ2UuUmVzb3VyY2VUeXBlIiwgImRl c2NyaXB0aW9uIjogIlJlc291cmNlIHR5cGUuIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJu YW1lIjogInJlc3BvbnNlIiwgIiRyZWYiOiAiUmVzb3VyY2VSZXNwb25zZSIsICJkZXNjcmlwdGlv biI6ICJSZXNwb25zZSBkYXRhLiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJl c3BvbnNlIiwgIiRyZWYiOiAiUmVzcG9uc2UiLCAiZGVzY3JpcHRpb24iOiAiUmVzcG9uc2UgZGF0 YS4iIH0KICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewpA QCAtNjE2LDEzICs2MjEsMTMgQEAKICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAog ICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogInJlc291cmNlTG9hZGVkRnJv bU1lbW9yeUNhY2hlIiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJyZXF1ZXN0U2VydmVkRnJv bU1lbW9yeUNhY2hlIiwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hl biBIVFRQIHJlcXVlc3QgaGFzIGJlZW4gc2VydmVkIGZyb20gbWVtb3J5IGNhY2hlLiIsCiAgICAg ICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAicmVxdWVzdElkIiwgIiRyZWYiOiAiUmVxdWVzdElkIiwgImRlc2NyaXB0aW9uIjogIlJlcXVl c3QgaWRlbnRpZmllci4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZnJhbWVJ ZCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJGcmFtZSBpZGVudGlmaWVyLiIs ICJoaWRkZW4iOiB0cnVlIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibG9hZGVy SWQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiTG9hZGVyIGlkZW50aWZpZXIu IiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImRvY3VtZW50VVJMIiwgInR5cGUi OiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlVSTCBvZiB0aGUgZG9jdW1lbnQgdGhpcyByZXNv dXJjZSBpcyBsb2FkZWQgZm9yLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJs b2FkZXJJZCIsICIkcmVmIjogIkxvYWRlcklkIiwgImRlc2NyaXB0aW9uIjogIkxvYWRlciBpZGVu dGlmaWVyLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJkb2N1bWVudFVSTCIs ICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJVUkwgb2YgdGhlIGRvY3VtZW50IHRo aXMgcmVxdWVzdCBpcyBsb2FkZWQgZm9yLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJ0aW1lc3RhbXAiLCAidHlwZSI6ICJudW1iZXIiLCAiZGVzY3JpcHRpb24iOiAiVGltZXN0 YW1wLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpbml0aWF0b3IiLCAiJHJl ZiI6ICJJbml0aWF0b3IiLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBpbml0aWF0b3IuIiB9LAog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJlc291cmNlIiwgIiRyZWYiOiAiQ2FjaGVk UmVzb3VyY2UiLCAiZGVzY3JpcHRpb24iOiAiQ2FjaGVkIHJlc291cmNlIGRhdGEuIiB9CkBAIC04 NTEsMTEgKzg1NiwxMSBAQAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNoaWxkcmVu IiwgInR5cGUiOiAiYXJyYXkiLCAib3B0aW9uYWwiOiB0cnVlLCAiaXRlbXMiOiB7ICIkcmVmIjog Ik5vZGUiIH0sICJkZXNjcmlwdGlvbiI6ICJDaGlsZCBub2RlcyBvZiB0aGlzIG5vZGUgd2hlbiBy ZXF1ZXN0ZWQgd2l0aCBjaGlsZHJlbi4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAiYXR0cmlidXRlcyIsICJ0eXBlIjogImFycmF5IiwgIm9wdGlvbmFsIjogdHJ1ZSwgIml0ZW1z IjogeyAidHlwZSI6ICJzdHJpbmciIH0sICJkZXNjcmlwdGlvbiI6ICJBdHRyaWJ1dGVzIG9mIHRo ZSA8Y29kZT5FbGVtZW50PC9jb2RlPiBub2RlIGluIHRoZSBmb3JtIG9mIGZsYXQgYXJyYXkgPGNv ZGU+W25hbWUxLCB2YWx1ZTEsIG5hbWUyLCB2YWx1ZTJdPC9jb2RlPi4iIH0sCiAgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAiZG9jdW1lbnRVUkwiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0 aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiRG9jdW1lbnQgVVJMIHRoYXQgPGNvZGU+RG9j dW1lbnQ8L2NvZGU+IG9yIDxjb2RlPkZyYW1lT3duZXI8L2NvZGU+IG5vZGUgcG9pbnRzIHRvLiIg fSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJwdWJsaWNJZCIsICJ0eXBlIjogInN0 cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICI8Y29kZT5Eb2N1bWVudFR5 cGU8L2NvZGU+J3MgcHVibGljSWQuIC8vIEZJWE1FIiB9LAotICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogInN5c3RlbUlkIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwg ImRlc2NyaXB0aW9uIjogIjxjb2RlPkRvY3VtZW50VHlwZTwvY29kZT4ncyBzeXN0ZW1JZC4gLy8g RklYTUUiIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaW50ZXJuYWxTdWJzZXQi LCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiPGNv ZGU+RG9jdW1lbnRUeXBlPC9jb2RlPidzIGludGVybmFsU3Vic2V0LiAvLyBGSVhNRSIgfSwKLSAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJuYW1lIiwgInR5cGUiOiAic3RyaW5nIiwgIm9w dGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIjxjb2RlPkF0dHI8L2NvZGU+J3MgbmFtZS4g Ly8gRklYTUUiIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidmFsdWUiLCAidHlw ZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiPGNvZGU+QXR0 cjwvY29kZT4ncyB2YWx1ZS4gLy8gRklYTUUiIH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJwdWJsaWNJZCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNj cmlwdGlvbiI6ICI8Y29kZT5Eb2N1bWVudFR5cGU8L2NvZGU+J3MgcHVibGljSWQuIiB9LAorICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN5c3RlbUlkIiwgInR5cGUiOiAic3RyaW5nIiwg Im9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIjxjb2RlPkRvY3VtZW50VHlwZTwvY29k ZT4ncyBzeXN0ZW1JZC4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaW50ZXJu YWxTdWJzZXQiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRp b24iOiAiPGNvZGU+RG9jdW1lbnRUeXBlPC9jb2RlPidzIGludGVybmFsU3Vic2V0LiIgfSwKKyAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJuYW1lIiwgInR5cGUiOiAic3RyaW5nIiwgIm9w dGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIjxjb2RlPkF0dHI8L2NvZGU+J3MgbmFtZS4i IH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidmFsdWUiLCAidHlwZSI6ICJzdHJp bmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiPGNvZGU+QXR0cjwvY29kZT4n cyB2YWx1ZS4iIH0KICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAgICAgICJkZXNjcmlw dGlvbiI6ICJET00gaW50ZXJhY3Rpb24gaXMgaW1wbGVtZW50ZWQgaW4gdGVybXMgb2YgbWlycm9y IG9iamVjdHMgdGhhdCByZXByZXNlbnQgdGhlIGFjdHVhbCBET00gbm9kZXMuIERPTU5vZGUgaXMg YSBiYXNlIG5vZGUgbWlycm9yIHR5cGUuIgogICAgICAgICAgICAgfSwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcAppbmRleCBiODgx YmNjODRkYTc5ODI2ZmQ2OTNlNTA1YThjNDQ4Zjg2NTJmOGQ1Li5lNWVmYjI3NmEyYzEyYzQzYmVj MGYxNDYzMjc4ZDY1OGIxMzQ0YmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCkBAIC0yMjYsNyArMjI2LDcgQEAgdm9pZCBJ bnNwZWN0b3JSZXNvdXJjZUFnZW50Ojp3aWxsU2VuZFJlcXVlc3QodW5zaWduZWQgbG9uZyBpZGVu dGlmaWVyLCBEb2N1bWVudEwKIAogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjptYXJrUmVz b3VyY2VBc0NhY2hlZCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpCiB7Ci0gICAgbV9mcm9udGVu ZC0+cmVzb3VyY2VNYXJrZWRBc0NhY2hlZChJZGVudGlmaWVyc0ZhY3Rvcnk6OnJlcXVlc3RJZChp ZGVudGlmaWVyKSk7CisgICAgbV9mcm9udGVuZC0+cmVxdWVzdFNlcnZlZEZyb21DYWNoZShJZGVu dGlmaWVyc0ZhY3Rvcnk6OnJlcXVlc3RJZChpZGVudGlmaWVyKSk7CiB9CiAKIHZvaWQgSW5zcGVj dG9yUmVzb3VyY2VBZ2VudDo6ZGlkUmVjZWl2ZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRp ZmllciwgRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVz cG9uc2UpCkBAIC0zMTIsNyArMzEyLDcgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50Ojpk aWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUoRG9jdW1lbnRMb2FkZXIqIGxvYWQKICAgICBt X3Jlc291cmNlc0RhdGEtPmFkZENhY2hlZFJlc291cmNlKHJlcXVlc3RJZCwgcmVzb3VyY2UpOwog ICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGluaXRpYXRvck9iamVjdCA9IGJ1aWxkSW5pdGlh dG9yT2JqZWN0KGxvYWRlci0+ZnJhbWUoKSA/IGxvYWRlci0+ZnJhbWUoKS0+ZG9jdW1lbnQoKSA6 IDApOwogCi0gICAgbV9mcm9udGVuZC0+cmVzb3VyY2VMb2FkZWRGcm9tTWVtb3J5Q2FjaGUocmVx dWVzdElkLCBmcmFtZUlkLCBsb2FkZXJJZCwgbG9hZGVyLT51cmwoKS5zdHJpbmcoKSwgY3VycmVu dFRpbWUoKSwgaW5pdGlhdG9yT2JqZWN0LCBidWlsZE9iamVjdEZvckNhY2hlZFJlc291cmNlKCpy ZXNvdXJjZSkpOworICAgIG1fZnJvbnRlbmQtPnJlcXVlc3RTZXJ2ZWRGcm9tTWVtb3J5Q2FjaGUo cmVxdWVzdElkLCBmcmFtZUlkLCBsb2FkZXJJZCwgbG9hZGVyLT51cmwoKS5zdHJpbmcoKSwgY3Vy cmVudFRpbWUoKSwgaW5pdGlhdG9yT2JqZWN0LCBidWlsZE9iamVjdEZvckNhY2hlZFJlc291cmNl KCpyZXNvdXJjZSkpOwogfQogCiB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OnNldEluaXRp YWxTY3JpcHRDb250ZW50KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBz b3VyY2VTdHJpbmcpCkBAIC00NzAsMTIgKzQ3MCwxMiBAQCB2b2lkIEluc3BlY3RvclJlc291cmNl QWdlbnQ6OnNldFVzZXJBZ2VudE92ZXJyaWRlKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiB1 cwogICAgIG1fdXNlckFnZW50T3ZlcnJpZGUgPSB1c2VyQWdlbnQ7CiB9CiAKLXZvaWQgSW5zcGVj dG9yUmVzb3VyY2VBZ2VudDo6c2V0RXh0cmFIZWFkZXJzKEVycm9yU3RyaW5nKiwgUGFzc1JlZlB0 cjxJbnNwZWN0b3JPYmplY3Q+IGhlYWRlcnMpCit2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6 OnNldEV4dHJhSFRUUEhlYWRlcnMoRXJyb3JTdHJpbmcqLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9i amVjdD4gaGVhZGVycykKIHsKICAgICBtX3N0YXRlLT5zZXRPYmplY3QoUmVzb3VyY2VBZ2VudFN0 YXRlOjpleHRyYVJlcXVlc3RIZWFkZXJzLCBoZWFkZXJzKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JS ZXNvdXJjZUFnZW50OjpnZXRSZXNvdXJjZUNvbnRlbnQoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5n LCBjb25zdCBTdHJpbmcmIHJlcXVlc3RJZCwgU3RyaW5nKiBjb250ZW50LCBib29sKiBiYXNlNjRF bmNvZGVkKQordm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpnZXRSZXNwb25zZUJvZHkoRXJy b3JTdHJpbmcqIGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIHJlcXVlc3RJZCwgU3RyaW5nKiBj b250ZW50LCBib29sKiBiYXNlNjRFbmNvZGVkKQogewogICAgIE5ldHdvcmtSZXNvdXJjZXNEYXRh OjpSZXNvdXJjZURhdGEgY29uc3QqIHJlc291cmNlRGF0YSA9IG1fcmVzb3VyY2VzRGF0YS0+ZGF0 YShyZXF1ZXN0SWQpOwogICAgIGlmICghcmVzb3VyY2VEYXRhKSB7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaAppbmRleCA5Mzc4YmJiMWUz MjI3Y2RhYWFhZmMxNDJkMmMyYzM4MzJiZDM2MjFhLi4yMzU3ODQ5OTY4OGE3ZjFmY2NkNWNjM2M2 MDlmZGYwZWQ3YjNiZjg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUmVzb3VyY2VBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JSZXNvdXJjZUFnZW50LmgKQEAgLTEyNCw4ICsxMjQsOCBAQCBwdWJsaWM6CiAgICAgdm9p ZCBlbmFibGUoRXJyb3JTdHJpbmcqKTsKICAgICB2b2lkIGRpc2FibGUoRXJyb3JTdHJpbmcqKTsK ICAgICB2b2lkIHNldFVzZXJBZ2VudE92ZXJyaWRlKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5n JiB1c2VyQWdlbnQpOwotICAgIHZvaWQgc2V0RXh0cmFIZWFkZXJzKEVycm9yU3RyaW5nKiwgUGFz c1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KTsKLSAgICB2b2lkIGdldFJlc291cmNlQ29udGVudChF cnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgcmVxdWVzdElkLCBTdHJpbmcqIGNvbnRlbnQsIGJv b2wqIGJhc2U2NEVuY29kZWQpOworICAgIHZvaWQgc2V0RXh0cmFIVFRQSGVhZGVycyhFcnJvclN0 cmluZyosIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0Pik7CisgICAgdm9pZCBnZXRSZXNwb25z ZUJvZHkoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHJlcXVlc3RJZCwgU3RyaW5nKiBjb250 ZW50LCBib29sKiBiYXNlNjRFbmNvZGVkKTsKICAgICB2b2lkIGNsZWFyQ2FjaGUoRXJyb3JTdHJp bmcqLCBjb25zdCBTdHJpbmcqIGNvbnN0IG9wdGlvbmFsUHJlc2VydmVkTG9hZGVySWQpOwogCiAg ICAgdm9pZCBjbGVhckJyb3dzZXJDYWNoZShFcnJvclN0cmluZyopOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcwppbmRleCBi MTc2MzM4ZjUzNWQ0NTJkZTIzMWNhZTcxOTMxOTVhZTEyMTZhYzMwLi4wOWIyMTM0NTY5M2JlYzYw NDc3ODFiNzc2ODY2Yzg5MTRhZDlmODQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcwpAQCAtMTc4LDcgKzE3OCw3IEBA IFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAg ICAgICAgICBhbGxIZWFkZXJzW25hbWVdID0gaGVhZGVyc1tuYW1lXTsKICAgICAgICAgICAgIH0K ICAgICAgICAgfQotICAgICAgICBOZXR3b3JrQWdlbnQuc2V0RXh0cmFIZWFkZXJzKGFsbEhlYWRl cnMpOworICAgICAgICBOZXR3b3JrQWdlbnQuc2V0RXh0cmFIVFRQSGVhZGVycyhhbGxIZWFkZXJz KTsKICAgICB9LAogCiAgICAgX29uQ3JlYXRlUGFuZWw6IGZ1bmN0aW9uKG1lc3NhZ2UsIHBvcnQp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtN YW5hZ2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFu YWdlci5qcwppbmRleCBhYmM0ZmI0MzZiZWY4NDg1ZWY2YzVhNmUwN2E3YzI1ZWVjNTg5OTc0Li4z NDQ2YTZkOTQxMTBkNzdjNTMyMmRiMGFjMGY2YTc2OWNmMGZmMThiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKQEAgLTYy LDcgKzYyLDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAg ICAgICAgLy8gRklYTUU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02 MTM2MyBXZSBzaG91bGQgc2VwYXJhdGUgTmV0d29ya1Jlc291cmNlIChOZXR3b3JrUGFuZWwgcmVz b3VyY2UpCiAgICAgICAgIC8vIGZyb20gUmVzb3VyY2VSZXZpc2lvbiAoUmVzb3VyY2VzUGFuZWwv U2NyaXB0c1BhbmVsIHJlc291cmNlKSBhbmQgcmVxdWVzdCBjb250ZW50IGFjY29yZGluZ2x5Lgog ICAgICAgICBpZiAocmVzb3VyY2UucmVxdWVzdElkKQotICAgICAgICAgICAgTmV0d29ya0FnZW50 LmdldFJlc291cmNlQ29udGVudChyZXNvdXJjZS5yZXF1ZXN0SWQsIGNhbGxiYWNrV3JhcHBlcik7 CisgICAgICAgICAgICBOZXR3b3JrQWdlbnQuZ2V0UmVzcG9uc2VCb2R5KHJlc291cmNlLnJlcXVl c3RJZCwgY2FsbGJhY2tXcmFwcGVyKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgUGFnZUFn ZW50LmdldFJlc291cmNlQ29udGVudChyZXNvdXJjZS5mcmFtZUlkLCByZXNvdXJjZS51cmwsIGNh bGxiYWNrV3JhcHBlcik7CiAgICAgfSwKQEAgLTE5Myw3ICsxOTMsNyBAQCBXZWJJbnNwZWN0b3Iu TmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9zdGFydFJlc291 cmNlKHJlc291cmNlKTsKICAgICB9LAogCi0gICAgcmVzb3VyY2VNYXJrZWRBc0NhY2hlZDogZnVu Y3Rpb24ocmVxdWVzdElkKQorICAgIHJlcXVlc3RTZXJ2ZWRGcm9tQ2FjaGU6IGZ1bmN0aW9uKHJl cXVlc3RJZCkKICAgICB7CiAgICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMuX2luZmxpZ2h0UmVz b3VyY2VzQnlJZFtyZXF1ZXN0SWRdOwogICAgICAgICBpZiAoIXJlc291cmNlKQpAQCAtMjU2LDcg KzI1Niw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHRoaXMuX2ZpbmlzaFJlc291cmNlKHJlc291cmNlLCB0aW1lKTsKICAgICB9LAogCi0g ICAgcmVzb3VyY2VMb2FkZWRGcm9tTWVtb3J5Q2FjaGU6IGZ1bmN0aW9uKHJlcXVlc3RJZCwgZnJh bWVJZCwgbG9hZGVySWQsIGRvY3VtZW50VVJMLCB0aW1lLCBpbml0aWF0b3IsIGNhY2hlZFJlc291 cmNlKQorICAgIHJlcXVlc3RTZXJ2ZWRGcm9tTWVtb3J5Q2FjaGU6IGZ1bmN0aW9uKHJlcXVlc3RJ ZCwgZnJhbWVJZCwgbG9hZGVySWQsIGRvY3VtZW50VVJMLCB0aW1lLCBpbml0aWF0b3IsIGNhY2hl ZFJlc291cmNlKQogICAgIHsKICAgICAgICAgdmFyIHJlc291cmNlID0gdGhpcy5fY3JlYXRlUmVz b3VyY2UocmVxdWVzdElkLCBmcmFtZUlkLCBsb2FkZXJJZCwgY2FjaGVkUmVzb3VyY2UudXJsLCBk b2N1bWVudFVSTCwgaW5pdGlhdG9yKTsKICAgICAgICAgdGhpcy5fdXBkYXRlUmVzb3VyY2VXaXRo Q2FjaGVkUmVzb3VyY2UocmVzb3VyY2UsIGNhY2hlZFJlc291cmNlKTsK 107997 2011-09-20 07:12:29 -0700 2011-09-21 04:28:39 -0700 Patch bug-68250-20110920181227.patch text/plain 21037 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTU1NDAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5MDNmYWJhMTBlZGMxYWUy NDY1NTBkZWExNzMxOTU2ZTE1MDdlZmNkLi40MGMwZmI4MGVmOTBlM2QxZGNkZmFiOGYzNGQ1MWIy MDFhNTI5YWMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDktMTYgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IGxpbWl0IHRoZSB1c2Ugb2YgIlJlc291cmNlIiB0ZXJtIGluIHRoZSBwcm90b2NvbC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MjUwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6bWFya1Jlc291 cmNlQXNDYWNoZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6 ZGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvclJlc291cmNlQWdlbnQ6OnNldEV4dHJhSFRUUEhlYWRlcnMpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6Z2V0UmVzcG9uc2VCb2R5KToKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4dGVu c2lvblNlcnZlci5wcm90b3R5cGUuX29uQWRkUmVxdWVzdEhlYWRlcnMpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuTmV0d29ya01hbmFnZXIucHJvdG90eXBlLnJlcXVlc3RDb250ZW50KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUucmVxdWVzdFNlcnZlZEZyb21D YWNoZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBl LnJlcXVlc3RTZXJ2ZWRGcm9tTWVtb3J5Q2FjaGUpOgorCiAyMDExLTA5LTE5ICBQYXZlbCBGZWxk bWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBkb2N1 bWVudCBEZWJ1Z2dlci5wYXVzZWQsIGludHJvZHVjZSB0eXBlcyBmb3IgaWRzIGluIERlYnVnZ2Vy IGRvbWFpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3Iu anNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCAxMTcy MzkyNTIxN2Y1NWExNzNmZWU4ODFiMDg3Nzc3MzM0OGE1NTI4Li4wYTkyNGUwZWU4YTliZGQ1OTgz MDEwZDRmYmRhYjNlNzRiMzE1YTBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ci5qc29uCkBAIC03Myw3ICs3Myw3IEBACiAgICAgICAgICAgICAgICAgInByb3BlcnRpZXMiOiBb CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaWQiLCAidHlwZSI6ICJzdHJpbmciLCAi ZGVzY3JpcHRpb24iOiAiRnJhbWUgdW5pcXVlIGlkZW50aWZpZXIuIiB9LAogICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInBhcmVudElkIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFs IjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlBhcmVudCBmcmFtZSBpZGVudGlmaWVyLiIgfSwKLSAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJsb2FkZXJJZCIsICJ0eXBlIjogInN0cmluZyIs ICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSBsb2FkZXIgYXNzb2NpYXRlZCB3aXRo IHRoaXMgZnJhbWUuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxvYWRlcklk IiwgIiRyZWYiOiAiTmV0d29yay5Mb2FkZXJJZCIsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVy IG9mIHRoZSBsb2FkZXIgYXNzb2NpYXRlZCB3aXRoIHRoaXMgZnJhbWUuIiB9LAogICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogIm5hbWUiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwi OiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiRnJhbWUncyBuYW1lIGFzIHNwZWNpZmllZCBpbiB0aGUg dGFnLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ1cmwiLCAidHlwZSI6ICJz dHJpbmciLCAiZGVzY3JpcHRpb24iOiAiRnJhbWUgZG9jdW1lbnQncyBVUkwuIiB9LAogICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogIm1pbWVUeXBlIiwgInR5cGUiOiAic3RyaW5nIiwgImRl c2NyaXB0aW9uIjogIkZyYW1lIGRvY3VtZW50J3MgbWltZVR5cGUgYXMgZGV0ZXJtaW5lZCBieSB0 aGUgYnJvd3Nlci4iIH0KQEAgLTIxMSw3ICsyMTEsNyBAQAogICAgICAgICAgICAgICAgICJkZXNj cmlwdGlvbiI6ICJGaXJlZCBvbmNlIG5hdmlnYXRpb24gb2YgdGhlIGZyYW1lIGhhcyBjb21wbGV0 ZWQuIEZyYW1lIGlzIG5vdyBhc3NvY2lhdGVkIHdpdGggdGhlIG5ldyBsb2FkZXIuIiwKICAgICAg ICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJmcmFtZSIsICIkcmVmIjogIkZyYW1lIiwgImRlc2NyaXB0aW9uIjogIkZyYW1lIG9iamVjdC4i IH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibG9hZGVySWQiLCAidHlwZSI6ICJz dHJpbmciLCAiZGVzY3JpcHRpb24iOiAiTG9hZGVyIGlkZW50aWZpZXIuIiB9CisgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAibG9hZGVySWQiLCAiJHJlZiI6ICJOZXR3b3JrLkxvYWRlcklk IiwgImRlc2NyaXB0aW9uIjogIkxvYWRlciBpZGVudGlmaWVyLiIgfQogICAgICAgICAgICAgICAg IF0sCiAgICAgICAgICAgICAgICAgImhpZGRlbiI6IHRydWUKICAgICAgICAgICAgIH0sCkBAIC0z NDgsNyArMzQ4LDcgQEAKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0ZXh0IiwgInR5 cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIk1lc3NhZ2UgdGV4dC4iIH0sCiAgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAibmV0d29ya1JlcXVlc3RJZCIsICIkcmVmIjogIk5ldHdv cmsuUmVxdWVzdElkIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIklkZW50aWZp ZXIgb2YgdGhlIG5ldHdvcmsgcmVxdWVzdCBhc3NvY2lhdGVkIHdpdGggdGhpcyBtZXNzYWdlLiIg fSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJwYXJhbWV0ZXJzIiwgInR5cGUiOiAi YXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIjogIlJ1bnRpbWUuUmVtb3RlT2JqZWN0IiB9LCAib3B0 aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiTWVzc2FnZSBwYXJhbWV0ZXJzIGluIGNhc2Ug b2YgdGhlIGZvcm1hdHRlZCBtZXNzYWdlLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJzdGFja1RyYWNlIiwgIiRyZWYiOiAiU3RhY2tUcmFjZSIsICJkZXNjcmlwdGlvbiI6ICJK YXZhU2NyaXB0IHN0YWNrIHRyYWNlIGZvciBhc3NlcnRpb25zIGFuZCBlcnJvciBtZXNzYWdlcy4i IH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdGFja1RyYWNlIiwgIiRyZWYiOiAi U3RhY2tUcmFjZSIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJKYXZhU2NyaXB0 IHN0YWNrIHRyYWNlIGZvciBhc3NlcnRpb25zIGFuZCBlcnJvciBtZXNzYWdlcy4iIH0KICAgICAg ICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewpAQCAtNDI1LDkgKzQy NSwxNCBAQAogICAgIH0sCiAgICAgewogICAgICAgICAiZG9tYWluIjogIk5ldHdvcmsiLAotICAg ICAgICAiZGVzY3JpcHRpb24iOiAiTmV0d29yayBkb21haW4gYWxsb3dzIHRyYWNraW5nIG5ldHdv cmsgYWN0aXZpdGllcyBvZiB0aGUgcGFnZS4gSXQgZXhwb3NlcyBpbmZvcm1hdGlvbiBhYm91dCBI VFRQIGFuZCBXZWJTb2NrZXQgcmVxdWVzdHMgYW5kIHJlc3BvbnNlcywgdGhlaXIgaGVhZGVycywg Ym9kaWVzLCB0aW1pbmcsIGV0Yy4gSXQgYWxzbyBhbGxvd3MgZ2V0dGluZyB0aGUgdHJlZSBvZiB0 aGUgRnJhbWVzIG9uIHRoZSBwYWdlIGFsb25nIHdpdGggaW5mb3JtYXRpb24gYWJvdXQgdGhlaXIg cmVzb3VyY2VzLiIsCisgICAgICAgICJkZXNjcmlwdGlvbiI6ICJOZXR3b3JrIGRvbWFpbiBhbGxv d3MgdHJhY2tpbmcgbmV0d29yayBhY3Rpdml0aWVzIG9mIHRoZSBwYWdlLiBJdCBleHBvc2VzIGlu Zm9ybWF0aW9uIGFib3V0IGh0dHAsIGZpbGUsIGRhdGEgYW5kIG90aGVyIHJlcXVlc3RzIGFuZCBy ZXNwb25zZXMsIHRoZWlyIGhlYWRlcnMsIGJvZGllcywgdGltaW5nLCBldGMuIiwKICAgICAgICAg InR5cGVzIjogWwogICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJpZCI6ICJMb2FkZXJJ ZCIsCisgICAgICAgICAgICAgICAgInR5cGUiOiAic3RyaW5nIiwKKyAgICAgICAgICAgICAgICAi ZGVzY3JpcHRpb24iOiAiVW5pcXVlIGxvYWRlciBpZGVudGlmaWVyLiIKKyAgICAgICAgICAgIH0s CisgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgImlkIjogIlJlcXVlc3RJZCIsCiAgICAg ICAgICAgICAgICAgInR5cGUiOiAic3RyaW5nIiwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRp b24iOiAiVW5pcXVlIHJlcXVlc3QgaWRlbnRpZmllci4iCkBAIC00NTIsNyArNDU3LDcgQEAKICAg ICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewotICAgICAgICAg ICAgICAgICJpZCI6ICJSZXNvdXJjZVJlcXVlc3QiLAorICAgICAgICAgICAgICAgICJpZCI6ICJS ZXF1ZXN0IiwKICAgICAgICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAg ICAgICJkZXNjcmlwdGlvbiI6ICJIVFRQIHJlcXVlc3QgZGF0YS4iLAogICAgICAgICAgICAgICAg ICJwcm9wZXJ0aWVzIjogWwpAQCAtNDYzLDcgKzQ2OCw3IEBACiAgICAgICAgICAgICAgICAgXQog ICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAiaWQiOiAiUmVz b3VyY2VSZXNwb25zZSIsCisgICAgICAgICAgICAgICAgImlkIjogIlJlc3BvbnNlIiwKICAgICAg ICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlv biI6ICJIVFRQIHJlc3BvbnNlIGRhdGEuIiwKICAgICAgICAgICAgICAgICAicHJvcGVydGllcyI6 IFsKQEAgLTQ3Nyw3ICs0ODIsNyBAQAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJl cXVlc3RIZWFkZXJzVGV4dCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJk ZXNjcmlwdGlvbiI6ICJIVFRQIHJlcXVlc3QgaGVhZGVycyB0ZXh0LiIgfSwKICAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJjb25uZWN0aW9uUmV1c2VkIiwgInR5cGUiOiAiYm9vbGVhbiIs ICJkZXNjcmlwdGlvbiI6ICJTcGVjaWZpZXMgd2hldGhlciBwaHlzaWNhbCBjb25uZWN0aW9uIHdh cyBhY3R1YWxseSByZXVzZWQgZm9yIHRoaXMgcmVxdWVzdC4iIH0sCiAgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiY29ubmVjdGlvbklkIiwgInR5cGUiOiAibnVtYmVyIiwgImRlc2NyaXB0 aW9uIjogIlBoeXNpY2FsIGNvbm5lY3Rpb24gaWQgdGhhdCB3YXMgYWN0dWFsbHkgdXNlZCBmb3Ig dGhpcyByZXF1ZXN0LiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJmcm9tRGlz a0NhY2hlIiwgInR5cGUiOiAiYm9vbGVhbiIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlv biI6ICJTcGVjaWZpZXMgdGhhdCB0aGUgcmVzb3VyY2Ugd2FzIGxvYWRlZCBmcm9tIHRoZSBkaXNr IGNhY2hlLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJmcm9tRGlza0NhY2hl IiwgInR5cGUiOiAiYm9vbGVhbiIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJT cGVjaWZpZXMgdGhhdCB0aGUgcmVxdWVzdCB3YXMgc2VydmVkIGZyb20gdGhlIGRpc2sgY2FjaGUu IiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInRpbWluZyIsICIkcmVmIjogIlJl c291cmNlVGltaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRpbWluZyBp bmZvcm1hdGlvbiBmb3IgdGhlIGdpdmVuIHJlcXVlc3QuIiB9CiAgICAgICAgICAgICAgICAgXQog ICAgICAgICAgICAgfSwKQEAgLTQ4OCwxNCArNDkzLDE0IEBACiAgICAgICAgICAgICAgICAgInBy b3BlcnRpZXMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidXJsIiwgInR5cGUi OiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlJlc291cmNlIFVSTC4iIH0sCiAgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICIkcmVmIjogIlBhZ2UuUmVzb3VyY2VUeXBlIiwg ImRlc2NyaXB0aW9uIjogIlR5cGUgb2YgdGhpcyByZXNvdXJjZS4iIH0sCi0gICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAicmVzcG9uc2UiLCAiJHJlZiI6ICJSZXNvdXJjZVJlc3BvbnNlIiwg ImRlc2NyaXB0aW9uIjogIkNhY2hlZCByZXNwb25zZSBkYXRhLiIgfSwKKyAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJyZXNwb25zZSIsICIkcmVmIjogIlJlc3BvbnNlIiwgImRlc2NyaXB0 aW9uIjogIkNhY2hlZCByZXNwb25zZSBkYXRhLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJib2R5U2l6ZSIsICJ0eXBlIjogIm51bWJlciIsICJkZXNjcmlwdGlvbiI6ICJDYWNo ZWQgcmVzcG9uc2UgYm9keSBzaXplLiIgfQogICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAg IH0sCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgImlkIjogIkluaXRpYXRvciIsCiAg ICAgICAgICAgICAgICAgInR5cGUiOiAib2JqZWN0IiwKLSAgICAgICAgICAgICAgICAiZGVzY3Jp cHRpb24iOiAiSW5mb3JtYXRpb24gYWJvdXQgdGhlIHJlc291cmNlIGxvYWQgaW5pdGlhdG9yLiIs CisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkluZm9ybWF0aW9uIGFib3V0IHRoZSBy ZXF1ZXN0IGluaXRpYXRvci4iLAogICAgICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogWwogICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInR5cGUiLCAidHlwZSI6ICJzdHJpbmciLCAiZW51 bSI6IFsicGFyc2VyIiwgInNjcmlwdCIsICJvdGhlciJdLCAiZGVzY3JpcHRpb24iOiAiVHlwZSBv ZiB0aGlzIGluaXRpYXRvci4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3Rh Y2tUcmFjZSIsICIkcmVmIjogIkNvbnNvbGUuU3RhY2tUcmFjZSIsICJvcHRpb25hbCI6IHRydWUs ICJkZXNjcmlwdGlvbiI6ICJJbml0aWF0b3IgSmF2YVNjcmlwdCBzdGFjayB0cmFjZSwgc2V0IGZv ciBTY3JpcHQgb25seS4iIH0sCkBAIC01MjEsMjAgKzUyNiwyMCBAQAogICAgICAgICAgICAgICAg IF0KICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUi OiAic2V0RXh0cmFIZWFkZXJzIiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJzZXRFeHRyYUhU VFBIZWFkZXJzIiwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiQWxsb3dzIHNlbmRp bmcgZXh0cmEgSFRUUCBoZWFkZXJzIHdpdGggdGhlIHJlcXVlc3RzIGZyb20gdGhpcyBwYWdlLiIs CiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAiaGVhZGVycyIsICJ0eXBlIjogIm9iamVjdCIsICJkZXNjcmlwdGlvbiI6ICJNYXAg d2l0aCBleHRyYSBIVFRQIGhlYWRlcnMuIiB9CiAgICAgICAgICAgICAgICAgXQogICAgICAgICAg ICAgfSwKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6ICJnZXRSZXNvdXJj ZUNvbnRlbnQiLAotICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJSZXR1cm5zIGNvbnRl bnQgb2YgdGhlIGdpdmVuIHJlc291cmNlLiIsCisgICAgICAgICAgICAgICAgIm5hbWUiOiAiZ2V0 UmVzcG9uc2VCb2R5IiwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiUmV0dXJucyBj b250ZW50IHNlcnZlZCBmb3IgdGhlIGdpdmVuIHJlcXVlc3QuIiwKICAgICAgICAgICAgICAgICAi cGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXF1ZXN0SWQi LCAiJHJlZiI6ICJSZXF1ZXN0SWQiLCAiZGVzY3JpcHRpb24iOiAiSWRlbnRpZmllciBvZiB0aGUg bmV0d29yayByZXF1ZXN0IHRvIGdldCBjb250ZW50IGZvci4iIH0KICAgICAgICAgICAgICAgICBd LAogICAgICAgICAgICAgICAgICJyZXR1cm5zIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJu YW1lIjogImNvbnRlbnQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiUmVzb3Vy Y2UgY29udGVudC4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiYm9keSIsICJ0 eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJSZXNwb25zZSBib2R5LiIgfSwKICAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJiYXNlNjRFbmNvZGVkIiwgInR5cGUiOiAiYm9vbGVh biIsICJkZXNjcmlwdGlvbiI6ICJUcnVlLCBpZiBjb250ZW50IHdhcyBzZXJ2ZWQgYXMgYmFzZTY0 LiIgfQogICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCkBAIC01NjEsMTggKzU2Niwx OCBAQAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogInJlcXVlc3RJZCIsICIkcmVmIjogIlJlcXVlc3RJZCIsICJkZXNjcmlwdGlv biI6ICJSZXF1ZXN0IGlkZW50aWZpZXIuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogImZyYW1lSWQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiRnJhbWUgaWRl bnRpZmllci4iLCAiaGlkZGVuIjogdHJ1ZSB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogImxvYWRlcklkIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkxvYWRlciBp ZGVudGlmaWVyLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJkb2N1bWVudFVS TCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJVUkwgb2YgdGhlIGRvY3VtZW50 IHRoaXMgcmVzb3VyY2UgaXMgbG9hZGVkIGZvci4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAicmVxdWVzdCIsICIkcmVmIjogIlJlc291cmNlUmVxdWVzdCIsICJkZXNjcmlwdGlv biI6ICJSZXF1ZXN0IGRhdGEuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxv YWRlcklkIiwgIiRyZWYiOiAiTG9hZGVySWQiLCAiZGVzY3JpcHRpb24iOiAiTG9hZGVyIGlkZW50 aWZpZXIuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImRvY3VtZW50VVJMIiwg InR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlVSTCBvZiB0aGUgZG9jdW1lbnQgdGhp cyByZXF1ZXN0IGlzIGxvYWRlZCBmb3IuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogInJlcXVlc3QiLCAiJHJlZiI6ICJSZXF1ZXN0IiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3Qg ZGF0YS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGltZXN0YW1wIiwgInR5 cGUiOiAibnVtYmVyIiwgImRlc2NyaXB0aW9uIjogIlRpbWVzdGFtcC4iIH0sCiAgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAiaW5pdGlhdG9yIiwgIiRyZWYiOiAiSW5pdGlhdG9yIiwgImRl c2NyaXB0aW9uIjogIlJlcXVlc3QgaW5pdGlhdG9yLiIgfSwKLSAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJzdGFja1RyYWNlIiwgIiRyZWYiOiAiQ29uc29sZS5TdGFja1RyYWNlIiwgImRl c2NyaXB0aW9uIjogIkphdmFTY3JpcHQgc3RhY2sgdHJhY2UgdXBvbiBpc3N1aW5nIHRoaXMgcmVx dWVzdC4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVkaXJlY3RSZXNwb25z ZSIsICJvcHRpb25hbCI6IHRydWUsICIkcmVmIjogIlJlc291cmNlUmVzcG9uc2UiLCAiZGVzY3Jp cHRpb24iOiAiUmVkaXJlY3QgcmVzcG9uc2UgZGF0YS4iIH0KKyAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJzdGFja1RyYWNlIiwgIiRyZWYiOiAiQ29uc29sZS5TdGFja1RyYWNlIiwgIm9w dGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkphdmFTY3JpcHQgc3RhY2sgdHJhY2UgdXBv biBpc3N1aW5nIHRoaXMgcmVxdWVzdC4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAicmVkaXJlY3RSZXNwb25zZSIsICJvcHRpb25hbCI6IHRydWUsICIkcmVmIjogIlJlc3BvbnNl IiwgImRlc2NyaXB0aW9uIjogIlJlZGlyZWN0IHJlc3BvbnNlIGRhdGEuIiB9CiAgICAgICAgICAg ICAgICAgXQogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAi bmFtZSI6ICJyZXNvdXJjZU1hcmtlZEFzQ2FjaGVkIiwKLSAgICAgICAgICAgICAgICAiZGVzY3Jp cHRpb24iOiAiRmlyZWQgd2hlbiByZXF1ZXN0IGlzIGtub3duIHRvIGJlIHNlcnZlZCBmcm9tIGRp c2sgY2FjaGUuIiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJyZXF1ZXN0U2VydmVkRnJvbUNh Y2hlIiwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgaWYgcmVxdWVzdCBl bmRlZCB1cCBsb2FkaW5nIGZyb20gY2FjaGUuIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVy cyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXF1ZXN0SWQiLCAiJHJlZiI6 ICJSZXF1ZXN0SWQiLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBpZGVudGlmaWVyLiIgfQogICAg ICAgICAgICAgICAgIF0KQEAgLTU4NCw3ICs1ODksNyBAQAogICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogInJlcXVlc3RJZCIsICIkcmVmIjogIlJlcXVlc3RJZCIsICJkZXNjcmlwdGlvbiI6 ICJSZXF1ZXN0IGlkZW50aWZpZXIuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog InRpbWVzdGFtcCIsICJ0eXBlIjogIm51bWJlciIsICJkZXNjcmlwdGlvbiI6ICJUaW1lc3RhbXAu IiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInR5cGUiLCAiJHJlZiI6ICJQYWdl LlJlc291cmNlVHlwZSIsICJkZXNjcmlwdGlvbiI6ICJSZXNvdXJjZSB0eXBlLiIgfSwKLSAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXNwb25zZSIsICIkcmVmIjogIlJlc291cmNlUmVz cG9uc2UiLCAiZGVzY3JpcHRpb24iOiAiUmVzcG9uc2UgZGF0YS4iIH0KKyAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJyZXNwb25zZSIsICIkcmVmIjogIlJlc3BvbnNlIiwgImRlc2NyaXB0 aW9uIjogIlJlc3BvbnNlIGRhdGEuIiB9CiAgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAg fSwKICAgICAgICAgICAgIHsKQEAgLTYxNiwxMyArNjIxLDEzIEBACiAgICAgICAgICAgICAgICAg XQogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6 ICJyZXNvdXJjZUxvYWRlZEZyb21NZW1vcnlDYWNoZSIsCisgICAgICAgICAgICAgICAgIm5hbWUi OiAicmVxdWVzdFNlcnZlZEZyb21NZW1vcnlDYWNoZSIsCiAgICAgICAgICAgICAgICAgImRlc2Ny aXB0aW9uIjogIkZpcmVkIHdoZW4gSFRUUCByZXF1ZXN0IGhhcyBiZWVuIHNlcnZlZCBmcm9tIG1l bW9yeSBjYWNoZS4iLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogInJlcXVlc3RJZCIsICIkcmVmIjogIlJlcXVlc3RJZCIsICJk ZXNjcmlwdGlvbiI6ICJSZXF1ZXN0IGlkZW50aWZpZXIuIiB9LAogICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImZyYW1lSWQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAi RnJhbWUgaWRlbnRpZmllci4iLCAiaGlkZGVuIjogdHJ1ZSB9LAotICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImxvYWRlcklkIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjog IkxvYWRlciBpZGVudGlmaWVyLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJk b2N1bWVudFVSTCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJVUkwgb2YgdGhl IGRvY3VtZW50IHRoaXMgcmVzb3VyY2UgaXMgbG9hZGVkIGZvci4iIH0sCisgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAibG9hZGVySWQiLCAiJHJlZiI6ICJMb2FkZXJJZCIsICJkZXNjcmlw dGlvbiI6ICJMb2FkZXIgaWRlbnRpZmllci4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAiZG9jdW1lbnRVUkwiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiVVJM IG9mIHRoZSBkb2N1bWVudCB0aGlzIHJlcXVlc3QgaXMgbG9hZGVkIGZvci4iIH0sCiAgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAidGltZXN0YW1wIiwgInR5cGUiOiAibnVtYmVyIiwgImRl c2NyaXB0aW9uIjogIlRpbWVzdGFtcC4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAiaW5pdGlhdG9yIiwgIiRyZWYiOiAiSW5pdGlhdG9yIiwgImRlc2NyaXB0aW9uIjogIlJlcXVl c3QgaW5pdGlhdG9yLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXNvdXJj ZSIsICIkcmVmIjogIkNhY2hlZFJlc291cmNlIiwgImRlc2NyaXB0aW9uIjogIkNhY2hlZCByZXNv dXJjZSBkYXRhLiIgfQpAQCAtODUxLDExICs4NTYsMTEgQEAKICAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJjaGlsZHJlbiIsICJ0eXBlIjogImFycmF5IiwgIm9wdGlvbmFsIjogdHJ1ZSwg Iml0ZW1zIjogeyAiJHJlZiI6ICJOb2RlIiB9LCAiZGVzY3JpcHRpb24iOiAiQ2hpbGQgbm9kZXMg b2YgdGhpcyBub2RlIHdoZW4gcmVxdWVzdGVkIHdpdGggY2hpbGRyZW4uIiB9LAogICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogImF0dHJpYnV0ZXMiLCAidHlwZSI6ICJhcnJheSIsICJvcHRp b25hbCI6IHRydWUsICJpdGVtcyI6IHsgInR5cGUiOiAic3RyaW5nIiB9LCAiZGVzY3JpcHRpb24i OiAiQXR0cmlidXRlcyBvZiB0aGUgPGNvZGU+RWxlbWVudDwvY29kZT4gbm9kZSBpbiB0aGUgZm9y bSBvZiBmbGF0IGFycmF5IDxjb2RlPltuYW1lMSwgdmFsdWUxLCBuYW1lMiwgdmFsdWUyXTwvY29k ZT4uIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImRvY3VtZW50VVJMIiwgInR5 cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkRvY3VtZW50 IFVSTCB0aGF0IDxjb2RlPkRvY3VtZW50PC9jb2RlPiBvciA8Y29kZT5GcmFtZU93bmVyPC9jb2Rl PiBub2RlIHBvaW50cyB0by4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicHVi bGljSWQiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24i OiAiPGNvZGU+RG9jdW1lbnRUeXBlPC9jb2RlPidzIHB1YmxpY0lkLiAvLyBGSVhNRSIgfSwKLSAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzeXN0ZW1JZCIsICJ0eXBlIjogInN0cmluZyIs ICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICI8Y29kZT5Eb2N1bWVudFR5cGU8L2Nv ZGU+J3Mgc3lzdGVtSWQuIC8vIEZJWE1FIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogImludGVybmFsU3Vic2V0IiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwg ImRlc2NyaXB0aW9uIjogIjxjb2RlPkRvY3VtZW50VHlwZTwvY29kZT4ncyBpbnRlcm5hbFN1YnNl dC4gLy8gRklYTUUiIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibmFtZSIsICJ0 eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICI8Y29kZT5B dHRyPC9jb2RlPidzIG5hbWUuIC8vIEZJWE1FIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJu YW1lIjogInZhbHVlIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2Ny aXB0aW9uIjogIjxjb2RlPkF0dHI8L2NvZGU+J3MgdmFsdWUuIC8vIEZJWE1FIiB9CisgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAicHVibGljSWQiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0 aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiPGNvZGU+RG9jdW1lbnRUeXBlPC9jb2RlPidz IHB1YmxpY0lkLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzeXN0ZW1JZCIs ICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICI8Y29k ZT5Eb2N1bWVudFR5cGU8L2NvZGU+J3Mgc3lzdGVtSWQuIiB9LAorICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImludGVybmFsU3Vic2V0IiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFs IjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIjxjb2RlPkRvY3VtZW50VHlwZTwvY29kZT4ncyBpbnRl cm5hbFN1YnNldC4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibmFtZSIsICJ0 eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICI8Y29kZT5B dHRyPC9jb2RlPidzIG5hbWUuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInZh bHVlIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjog Ijxjb2RlPkF0dHI8L2NvZGU+J3MgdmFsdWUuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAg ICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRE9NIGludGVyYWN0aW9uIGlzIGltcGxlbWVudGVk IGluIHRlcm1zIG9mIG1pcnJvciBvYmplY3RzIHRoYXQgcmVwcmVzZW50IHRoZSBhY3R1YWwgRE9N IG5vZGVzLiBET01Ob2RlIGlzIGEgYmFzZSBub2RlIG1pcnJvciB0eXBlLiIKICAgICAgICAgICAg IH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VB Z2VudC5jcHAKaW5kZXggN2Q5YWU3MGMyZGUxZDE2MTIxNTc2YTNiZWVmMDkwNWZmYzVmYjI4My4u ZDM4MjNlNjYyOGEyYjRjMTdiNWQxYTcwNDkwODAzMjA0MTg2NzgyNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcApAQCAtMjI2 LDcgKzIyNiw3IEBAIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6d2lsbFNlbmRSZXF1ZXN0 KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRMCiAKIHZvaWQgSW5zcGVjdG9yUmVz b3VyY2VBZ2VudDo6bWFya1Jlc291cmNlQXNDYWNoZWQodW5zaWduZWQgbG9uZyBpZGVudGlmaWVy KQogewotICAgIG1fZnJvbnRlbmQtPnJlc291cmNlTWFya2VkQXNDYWNoZWQoSWRlbnRpZmllcnNG YWN0b3J5OjpyZXF1ZXN0SWQoaWRlbnRpZmllcikpOworICAgIG1fZnJvbnRlbmQtPnJlcXVlc3RT ZXJ2ZWRGcm9tQ2FjaGUoSWRlbnRpZmllcnNGYWN0b3J5OjpyZXF1ZXN0SWQoaWRlbnRpZmllcikp OwogfQogCiB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZFJlY2VpdmVSZXNwb25zZSh1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIGNvbnN0IFJl c291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQpAQCAtMzEyLDcgKzMxMiw3IEBAIHZvaWQgSW5zcGVj dG9yUmVzb3VyY2VBZ2VudDo6ZGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKERvY3VtZW50 TG9hZGVyKiBsb2FkCiAgICAgbV9yZXNvdXJjZXNEYXRhLT5hZGRDYWNoZWRSZXNvdXJjZShyZXF1 ZXN0SWQsIHJlc291cmNlKTsKICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBpbml0aWF0b3JP YmplY3QgPSBidWlsZEluaXRpYXRvck9iamVjdChsb2FkZXItPmZyYW1lKCkgPyBsb2FkZXItPmZy YW1lKCktPmRvY3VtZW50KCkgOiAwKTsKIAotICAgIG1fZnJvbnRlbmQtPnJlc291cmNlTG9hZGVk RnJvbU1lbW9yeUNhY2hlKHJlcXVlc3RJZCwgZnJhbWVJZCwgbG9hZGVySWQsIGxvYWRlci0+dXJs KCkuc3RyaW5nKCksIGN1cnJlbnRUaW1lKCksIGluaXRpYXRvck9iamVjdCwgYnVpbGRPYmplY3RG b3JDYWNoZWRSZXNvdXJjZSgqcmVzb3VyY2UpKTsKKyAgICBtX2Zyb250ZW5kLT5yZXF1ZXN0U2Vy dmVkRnJvbU1lbW9yeUNhY2hlKHJlcXVlc3RJZCwgZnJhbWVJZCwgbG9hZGVySWQsIGxvYWRlci0+ dXJsKCkuc3RyaW5nKCksIGN1cnJlbnRUaW1lKCksIGluaXRpYXRvck9iamVjdCwgYnVpbGRPYmpl Y3RGb3JDYWNoZWRSZXNvdXJjZSgqcmVzb3VyY2UpKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JSZXNv dXJjZUFnZW50OjpzZXRJbml0aWFsU2NyaXB0Q29udGVudCh1bnNpZ25lZCBsb25nIGlkZW50aWZp ZXIsIGNvbnN0IFN0cmluZyYgc291cmNlU3RyaW5nKQpAQCAtNDcwLDEyICs0NzAsMTIgQEAgdm9p ZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpzZXRVc2VyQWdlbnRPdmVycmlkZShFcnJvclN0cmlu ZyosIGNvbnN0IFN0cmluZyYgdXMKICAgICBtX3VzZXJBZ2VudE92ZXJyaWRlID0gdXNlckFnZW50 OwogfQogCi12b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OnNldEV4dHJhSGVhZGVycyhFcnJv clN0cmluZyosIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBoZWFkZXJzKQordm9pZCBJbnNw ZWN0b3JSZXNvdXJjZUFnZW50OjpzZXRFeHRyYUhUVFBIZWFkZXJzKEVycm9yU3RyaW5nKiwgUGFz c1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGhlYWRlcnMpCiB7CiAgICAgbV9zdGF0ZS0+c2V0T2Jq ZWN0KFJlc291cmNlQWdlbnRTdGF0ZTo6ZXh0cmFSZXF1ZXN0SGVhZGVycywgaGVhZGVycyk7CiB9 CiAKLXZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6Z2V0UmVzb3VyY2VDb250ZW50KEVycm9y U3RyaW5nKiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiByZXF1ZXN0SWQsIFN0cmluZyogY29u dGVudCwgYm9vbCogYmFzZTY0RW5jb2RlZCkKK3ZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6 Z2V0UmVzcG9uc2VCb2R5KEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBy ZXF1ZXN0SWQsIFN0cmluZyogY29udGVudCwgYm9vbCogYmFzZTY0RW5jb2RlZCkKIHsKICAgICBO ZXR3b3JrUmVzb3VyY2VzRGF0YTo6UmVzb3VyY2VEYXRhIGNvbnN0KiByZXNvdXJjZURhdGEgPSBt X3Jlc291cmNlc0RhdGEtPmRhdGEocmVxdWVzdElkKTsKICAgICBpZiAoIXJlc291cmNlRGF0YSkg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNl QWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50 LmgKaW5kZXggOTM3OGJiYjFlMzIyN2NkYWFhYWZjMTQyZDJjMmMzODMyYmQzNjIxYS4uMjM1Nzg0 OTk2ODhhN2YxZmNjZDVjYzNjNjA5ZmRmMGVkN2IzYmY4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oCkBAIC0xMjQsOCArMTI0LDgg QEAgcHVibGljOgogICAgIHZvaWQgZW5hYmxlKEVycm9yU3RyaW5nKik7CiAgICAgdm9pZCBkaXNh YmxlKEVycm9yU3RyaW5nKik7CiAgICAgdm9pZCBzZXRVc2VyQWdlbnRPdmVycmlkZShFcnJvclN0 cmluZyosIGNvbnN0IFN0cmluZyYgdXNlckFnZW50KTsKLSAgICB2b2lkIHNldEV4dHJhSGVhZGVy cyhFcnJvclN0cmluZyosIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0Pik7Ci0gICAgdm9pZCBn ZXRSZXNvdXJjZUNvbnRlbnQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHJlcXVlc3RJZCwg U3RyaW5nKiBjb250ZW50LCBib29sKiBiYXNlNjRFbmNvZGVkKTsKKyAgICB2b2lkIHNldEV4dHJh SFRUUEhlYWRlcnMoRXJyb3JTdHJpbmcqLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4pOwor ICAgIHZvaWQgZ2V0UmVzcG9uc2VCb2R5KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiByZXF1 ZXN0SWQsIFN0cmluZyogY29udGVudCwgYm9vbCogYmFzZTY0RW5jb2RlZCk7CiAgICAgdm9pZCBj bGVhckNhY2hlKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nKiBjb25zdCBvcHRpb25hbFByZXNl cnZlZExvYWRlcklkKTsKIAogICAgIHZvaWQgY2xlYXJCcm93c2VyQ2FjaGUoRXJyb3JTdHJpbmcq KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5z aW9uU2VydmVyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNp b25TZXJ2ZXIuanMKaW5kZXggODFlNzcwMWI5ZDVhMmM1NjRmY2MxN2UwNjA3ZWI0ODc3MTA0OWRh Mi4uZTYyN2EyNDViOGJiYWUxNmE2Y2NiMmFmZDk3YzExODlkNjdkZmEyZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMK QEAgLTE3OCw3ICsxNzgsNyBAQCBXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2VydmVyLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgICAgICAgICAgYWxsSGVhZGVyc1tuYW1lXSA9IGhlYWRlcnNbbmFt ZV07CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgICAgTmV0d29ya0FnZW50LnNldEV4 dHJhSGVhZGVycyhhbGxIZWFkZXJzKTsKKyAgICAgICAgTmV0d29ya0FnZW50LnNldEV4dHJhSFRU UEhlYWRlcnMoYWxsSGVhZGVycyk7CiAgICAgfSwKIAogICAgIF9vbkNyZWF0ZVBhbmVsOiBmdW5j dGlvbihtZXNzYWdlLCBwb3J0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKaW5kZXggYWJjNGZiNDM2YmVmODQ4NWVmNmM1YTZl MDdhN2MyNWVlYzU4OTk3NC4uMzQ0NmE2ZDk0MTEwZDc3YzUzMjJkYjBhYzBmNmE3NjljZjBmZjE4 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3Jr TWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdv cmtNYW5hZ2VyLmpzCkBAIC02Miw3ICs2Miw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdl ci5wcm90b3R5cGUgPSB7CiAgICAgICAgIC8vIEZJWE1FOiBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjEzNjMgV2Ugc2hvdWxkIHNlcGFyYXRlIE5ldHdvcmtSZXNvdXJj ZSAoTmV0d29ya1BhbmVsIHJlc291cmNlKQogICAgICAgICAvLyBmcm9tIFJlc291cmNlUmV2aXNp b24gKFJlc291cmNlc1BhbmVsL1NjcmlwdHNQYW5lbCByZXNvdXJjZSkgYW5kIHJlcXVlc3QgY29u dGVudCBhY2NvcmRpbmdseS4KICAgICAgICAgaWYgKHJlc291cmNlLnJlcXVlc3RJZCkKLSAgICAg ICAgICAgIE5ldHdvcmtBZ2VudC5nZXRSZXNvdXJjZUNvbnRlbnQocmVzb3VyY2UucmVxdWVzdElk LCBjYWxsYmFja1dyYXBwZXIpOworICAgICAgICAgICAgTmV0d29ya0FnZW50LmdldFJlc3BvbnNl Qm9keShyZXNvdXJjZS5yZXF1ZXN0SWQsIGNhbGxiYWNrV3JhcHBlcik7CiAgICAgICAgIGVsc2UK ICAgICAgICAgICAgIFBhZ2VBZ2VudC5nZXRSZXNvdXJjZUNvbnRlbnQocmVzb3VyY2UuZnJhbWVJ ZCwgcmVzb3VyY2UudXJsLCBjYWxsYmFja1dyYXBwZXIpOwogICAgIH0sCkBAIC0xOTMsNyArMTkz LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlwZSA9IHsKICAgICAg ICAgdGhpcy5fc3RhcnRSZXNvdXJjZShyZXNvdXJjZSk7CiAgICAgfSwKIAotICAgIHJlc291cmNl TWFya2VkQXNDYWNoZWQ6IGZ1bmN0aW9uKHJlcXVlc3RJZCkKKyAgICByZXF1ZXN0U2VydmVkRnJv bUNhY2hlOiBmdW5jdGlvbihyZXF1ZXN0SWQpCiAgICAgewogICAgICAgICB2YXIgcmVzb3VyY2Ug PSB0aGlzLl9pbmZsaWdodFJlc291cmNlc0J5SWRbcmVxdWVzdElkXTsKICAgICAgICAgaWYgKCFy ZXNvdXJjZSkKQEAgLTI1Niw3ICsyNTYsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNo ZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9maW5pc2hSZXNvdXJjZShyZXNvdXJjZSwg dGltZSk7CiAgICAgfSwKIAotICAgIHJlc291cmNlTG9hZGVkRnJvbU1lbW9yeUNhY2hlOiBmdW5j dGlvbihyZXF1ZXN0SWQsIGZyYW1lSWQsIGxvYWRlcklkLCBkb2N1bWVudFVSTCwgdGltZSwgaW5p dGlhdG9yLCBjYWNoZWRSZXNvdXJjZSkKKyAgICByZXF1ZXN0U2VydmVkRnJvbU1lbW9yeUNhY2hl OiBmdW5jdGlvbihyZXF1ZXN0SWQsIGZyYW1lSWQsIGxvYWRlcklkLCBkb2N1bWVudFVSTCwgdGlt ZSwgaW5pdGlhdG9yLCBjYWNoZWRSZXNvdXJjZSkKICAgICB7CiAgICAgICAgIHZhciByZXNvdXJj ZSA9IHRoaXMuX2NyZWF0ZVJlc291cmNlKHJlcXVlc3RJZCwgZnJhbWVJZCwgbG9hZGVySWQsIGNh Y2hlZFJlc291cmNlLnVybCwgZG9jdW1lbnRVUkwsIGluaXRpYXRvcik7CiAgICAgICAgIHRoaXMu X3VwZGF0ZVJlc291cmNlV2l0aENhY2hlZFJlc291cmNlKHJlc291cmNlLCBjYWNoZWRSZXNvdXJj ZSk7Cg==