153624 2016-01-28 17:15:22 -0800 Add code to parse the git branches out of the Trac RSS feed 2016-02-01 16:56:36 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=152345 P2 Normal --- 152345 1 jmarcell webkit-unassigned adele ap dbates dean_johnson dino jmarcell lforschler oldest_to_newest 1159953 0 jmarcell 2016-01-28 17:15:22 -0800 Add code to parse the git branches out of the Trac RSS feed 1159954 1 270165 jmarcell 2016-01-28 17:17:42 -0800 Created attachment 270165 Patch 1159985 2 270165 dbates 2016-01-28 19:34:27 -0800 Comment on attachment 270165 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=270165&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:69 > + return (!commit.containsBranchLocation || commit.branchName === branchName || (commit.branchName instanceof Array && commit.branchName.includes(branchName))) && filter(commit); This does not seem like the correct approach. In particular, its weird that branchName could be either a String object or an Array object. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:172 > + var gitBranches = doc.evaluate("./branches", commitElement, null, XPathResult.STRING_TYPE).stringValue; > + if (gitBranches) { > + result.containsBranchLocation = true; > + result.branchName = gitBranches.split(", "); > + } We need a test case for a multi-branch commit. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js:60 > + strictEqual(commits.length, 6, "should have 6 commits"); It's weird that there are six commits because on first glance this test only parses a single commit. I know that five of these commits are hardcoded in class MockTrac. Can we extract the hardcoded recorded commits from MockTrac into some kind of constant, maybe MockTrac.EXAMPLE_TRAC_COMMITS, such that MockTrac has no recorded commits by default? Unit tests that want to make use of this set of mock commits could then set MockTrac.recordedCommits = MockTrac.EXAMPLE_TRAC_COMMITS. And we would not make use of this set of commits for this test. 1160959 3 270409 jmarcell 2016-02-01 11:44:19 -0800 Created attachment 270409 Adds git branches to the timeline RSS feed Alexey suggested checking this into the repository somewhere but I'm not sure where it belongs. 1161037 4 270426 jmarcell 2016-02-01 14:35:01 -0800 Created attachment 270426 Patch 1161040 5 jmarcell 2016-02-01 14:37:04 -0800 (In reply to comment #2) > Comment on attachment 270165 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=270165&action=review > > > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:69 > > + return (!commit.containsBranchLocation || commit.branchName === branchName || (commit.branchName instanceof Array && commit.branchName.includes(branchName))) && filter(commit); > > This does not seem like the correct approach. In particular, its weird that > branchName could be either a String object or an Array object. I addressed this in the latest patch. I refactored 'branchName' to be 'branches', changed the type of the variable to be an array, and updated the code that interacts with it accordingly. > > > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:172 > > + var gitBranches = doc.evaluate("./branches", commitElement, null, XPathResult.STRING_TYPE).stringValue; > > + if (gitBranches) { > > + result.containsBranchLocation = true; > > + result.branchName = gitBranches.split(", "); > > + } > > We need a test case for a multi-branch commit. I added a test case and corresponding assertions for a multi-branch commit. > > > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js:60 > > + strictEqual(commits.length, 6, "should have 6 commits"); > > It's weird that there are six commits because on first glance this test only > parses a single commit. I know that five of these commits are hardcoded in > class MockTrac. Can we extract the hardcoded recorded commits from MockTrac > into some kind of constant, maybe MockTrac.EXAMPLE_TRAC_COMMITS, such that > MockTrac has no recorded commits by default? Unit tests that want to make > use of this set of mock commits could then set MockTrac.recordedCommits = > MockTrac.EXAMPLE_TRAC_COMMITS. And we would not make use of this set of > commits for this test. I did this in the latest patch as well. 1161060 6 270426 dbates 2016-02-01 15:21:16 -0800 Comment on attachment 270426 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=270426&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:169 > + var gitBranches = doc.evaluate("./branches", commitElement, null, XPathResult.STRING_TYPE).stringValue; I am assuming that doc.evaluate("./branches", commitElement, null, XPathResult.STRING_TYPE) always returns an object. We should add a test case for an entry that does not have <branches>. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js:54 > + client.open('GET', 'test-fixture-git-trac-rss.xml', false); Nit: We use single quoted string literals here and double quoted string literals below. We should pick one quoting style for string literals and stick with it. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js:58 > + client.onreadystatechange = function () { > + if (client.readyState === client.DONE) > + this.trac._loaded(client.responseXML); > + }.bind(this); Nit: We're underutilizing the the onreadystatechange listener. Since we only care if the load completed successfully, we could register a onload listener. See <https://xhr.spec.whatwg.org/#event-handlers> for a list of the event handlers that can be registered on XMLHttpRequest. 1161111 7 270448 jmarcell 2016-02-01 16:19:26 -0800 Created attachment 270448 Patch 1161113 8 270448 dbates 2016-02-01 16:28:28 -0800 Comment on attachment 270448 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=270448&action=review > Tools/ChangeLog:3 > + Add code to parse the git branches out of the Trac RSS feed. Nit: Remove the period at the end of this line so that it reflects the name of this bug. > Tools/ChangeLog:9 > + (Trac.prototype.commitsOnBranch): Update filter to check for git branches. Nit: git => Git > Tools/ChangeLog:10 > + (Trac.prototype._convertCommitInfoElementToObject): Parse git branches from the Trac RSS feed. Also changed "branchName" to Ditto. > Tools/ChangeLog:15 > + fixture that contains XML with a git branch. Ditto. > Tools/ChangeLog:16 > + * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js: Added unit test to test parsing git Ditto. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js:59 > + strictEqual(commits.length, 3, "should have 2 commits"); 2 => 3 1161137 9 jmarcell 2016-02-01 16:56:36 -0800 Landed: http://trac.webkit.org/changeset/195993 270165 2016-01-28 17:17:42 -0800 2016-02-01 14:34:58 -0800 Patch bug-153624-20160128171716.patch text/plain 6679 jmarcell U3VidmVyc2lvbiBSZXZpc2lvbjogMTk1NzkwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjZkMmZjM2I3OWFiMWI1ZDllNGQzNmYxM2JmOTBmNmFk ZWYyNmUwNi4uZjQ0ZTU5OGZmMWUxOWQ2OTNlYmI2OThkNmY5MjI3OGZkZTM2MGQzMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIw IEBACiAyMDE2LTAxLTI4ICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxAYXBwbGUuY29tPgogCisg ICAgICAgIEFkZCBjb2RlIHRvIHBhcnNlIHRoZSBnaXQgYnJhbmNoZXMgb3V0IG9mIHRoZSBUcmFj IFJTUyBmZWVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTUzNjI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRt bC9kYXNoYm9hcmQvU2NyaXB0cy9UcmFjLmpzOgorICAgICAgICAoVHJhYy5wcm90b3R5cGUuY29t bWl0c09uQnJhbmNoKTogVXBkYXRlIGZpbHRlciB0byBjaGVjayBmb3IgZ2l0IGJyYW5jaGVzLgor ICAgICAgICAoVHJhYy5wcm90b3R5cGUuX2NvbnZlcnRDb21taXRJbmZvRWxlbWVudFRvT2JqZWN0 KTogUGFyc2UgZ2l0IGJyYW5jaGVzIGZyb20gdGhlIFRyYWMgUlNTIGZlZWQuCisgICAgICAgICog QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFz aGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdC1maXh0dXJlLWdpdC10cmFjLXJzcy54bWw6IEFkZGVk LiBUZXN0IGZpeHR1cmUKKyAgICAgICAgdGhhdCBjb250YWlucyBYTUwgd2l0aCBhIGdpdCBicmFu Y2guCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv cHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdHMuanM6IEFkZGVkIHVuaXQg dGVzdCB0byB0ZXN0IHBhcnNpbmcgZ2l0CisgICAgICAgIGJyYW5jaGVzIGZyb20gVHJhYyBSU1Mg ZmVlZC4KKworMjAxNi0wMS0yOCAgSmFzb24gTWFyY2VsbCAgPGptYXJjZWxsQGFwcGxlLmNvbT4K KwogICAgICAgICBJbXByb3ZlbWVudHMgdG8gYm90d2F0Y2hlcidzIGRhc2hib2FyZCB1bml0IHRl c3RzLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUz NjIxCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1RyYWMuanMgYi9Ub29scy9C dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNo Ym9hcmQvU2NyaXB0cy9UcmFjLmpzCmluZGV4IDQ3MDMwNTlkMzE4MTRkY2E4OWZlYjk0ZGYwZjFh MDlhNWMyZGM2MzIuLjViODRiMDE5N2NkMGMzZjVjMDEwODU1NmMyMjlhYWM0ZDBlZjk4N2UgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1RyYWMuanMKKysrIGIvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvVHJhYy5qcwpAQCAtNjYsNyArNjYsNyBAQCBUcmFjLnByb3RvdHlwZSA9IHsKICAg ICBjb21taXRzT25CcmFuY2g6IGZ1bmN0aW9uKGJyYW5jaE5hbWUsIGZpbHRlcikKICAgICB7CiAg ICAgICAgIHJldHVybiB0aGlzLnJlY29yZGVkQ29tbWl0cy5maWx0ZXIoZnVuY3Rpb24oY29tbWl0 KSB7Ci0gICAgICAgICAgICByZXR1cm4gKCFjb21taXQuY29udGFpbnNCcmFuY2hMb2NhdGlvbiB8 fCBjb21taXQuYnJhbmNoTmFtZSA9PT0gYnJhbmNoTmFtZSkgJiYgZmlsdGVyKGNvbW1pdCk7Cisg ICAgICAgICAgICByZXR1cm4gKCFjb21taXQuY29udGFpbnNCcmFuY2hMb2NhdGlvbiB8fCBjb21t aXQuYnJhbmNoTmFtZSA9PT0gYnJhbmNoTmFtZSB8fCAoY29tbWl0LmJyYW5jaE5hbWUgaW5zdGFu Y2VvZiBBcnJheSAmJiBjb21taXQuYnJhbmNoTmFtZS5pbmNsdWRlcyhicmFuY2hOYW1lKSkpICYm IGZpbHRlcihjb21taXQpOwogICAgICAgICB9KTsKICAgICB9LAogCkBAIC0xNjUsNiArMTY1LDEy IEBAIFRyYWMucHJvdG90eXBlID0gewogICAgICAgICAgICAgfQogICAgICAgICB9CiAKKyAgICAg ICAgdmFyIGdpdEJyYW5jaGVzID0gZG9jLmV2YWx1YXRlKCIuL2JyYW5jaGVzIiwgY29tbWl0RWxl bWVudCwgbnVsbCwgWFBhdGhSZXN1bHQuU1RSSU5HX1RZUEUpLnN0cmluZ1ZhbHVlOworICAgICAg ICBpZiAoZ2l0QnJhbmNoZXMpIHsKKyAgICAgICAgICAgIHJlc3VsdC5jb250YWluc0JyYW5jaExv Y2F0aW9uID0gdHJ1ZTsKKyAgICAgICAgICAgIHJlc3VsdC5icmFuY2hOYW1lID0gZ2l0QnJhbmNo ZXMuc3BsaXQoIiwgIik7CisgICAgICAgIH0KKwogICAgICAgICByZXR1cm4gcmVzdWx0OwogICAg IH0sCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL3Rlc3QtZml4dHVy ZS1naXQtdHJhYy1yc3MueG1sIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdC1maXh0 dXJlLWdpdC10cmFjLXJzcy54bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjEwZTQyNjNjMmM1N2M0YTMwZTc3MGQw MDlkMTQ1MmU3OTFlYmJkNwotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRz L3Rlc3RzL3Rlc3QtZml4dHVyZS1naXQtdHJhYy1yc3MueG1sCkBAIC0wLDAgKzEsNTIgQEAKKzw/ eG1sIHZlcnNpb249IjEuMCI/PgorPCEtLQorQ29weXJpZ2h0IChDKSAyMDE2IEFwcGxlLCBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisKK1JlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCithcmUgbWV0Ogor MS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBj b3B5cmlnaHQKKyAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lci4KKzIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0 IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgICBkb2N1bWVu dGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0 aW9uLgorCitUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBD T05UUklCVVRPUlMgYGBBUyBJUycnCitBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5U SUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKK1RIRSBJTVBMSUVEIFdBUlJBTlRJ RVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKK1BVUlBP U0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENP TlRSSUJVVE9SUworQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRB TCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJ TkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKK1NVQlNUSVRVVEUgR09PRFMg T1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUwor SU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJ VFksIFdIRVRIRVIgSU4KK0NPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNM VURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCitBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9G IFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCitUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCistLT4KKworPHJzcyB4bWxuczpkYz0iaHR0cDovL3B1cmwu b3JnL2RjL2VsZW1lbnRzLzEuMS8iIHZlcnNpb249IjIuMCI+CisgIDxjaGFubmVsPgorICAgIDx0 aXRsZT5XZWJLaXQ8L3RpdGxlPgorICAgIDxsaW5rPmh0dHBzOi8vdHJhYy53ZWJraXQub3JnL3Rp bWVsaW5lPC9saW5rPgorICAgIDxkZXNjcmlwdGlvbj5UcmFjIFRpbWVsaW5lPC9kZXNjcmlwdGlv bj4KKyAgICA8bGFuZ3VhZ2U+ZW4tVVM8L2xhbmd1YWdlPgorICAgIDxnZW5lcmF0b3I+VHJhYyAw LjEyLjM8L2dlbmVyYXRvcj4KKyAgICA8aW1hZ2U+CisgICAgICA8dGl0bGU+V2ViS2l0PC90aXRs ZT4KKyAgICAgIDx1cmw+aHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hyb21lL3NpdGUvZmF2aWNv bi5wbmc8L3VybD4KKyAgICAgIDxsaW5rPmh0dHBzOi8vdHJhYy53ZWJraXQub3JnL3RpbWVsaW5l PC9saW5rPgorICAgIDwvaW1hZ2U+CisgICAgPGl0ZW0+CisgICAgICA8dGl0bGU+Q2hhbmdlc2V0 IFszMzAyNV06IEl0YSBwcm9yc3VzIGlucXVhbSBBZCBjb3JwdXMgZGljZXJlcyBwZXJ0aW5lcmUs IHNlZCBlYSwgcXVhZSBkaXhpPC90aXRsZT4KKyAgICAgIDxicmFuY2hlcz5tYXN0ZXI8L2JyYW5j aGVzPgorCisgICAgICAgIDxhdXRob3I+Z2VvcmdlQHdlYmtpdC5vcmc8L2F1dGhvcj4KKworICAg ICAgPHB1YkRhdGU+VHVlLCAyNiBKYW4gMjAxNiAyMjo0ODoxNSBHTVQ8L3B1YkRhdGU+CisgICAg ICA8bGluaz5odHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMzMwMjU8L2xpbms+Cisg ICAgICA8Z3VpZCBpc1Blcm1hTGluaz0iZmFsc2UiPmh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2No YW5nZXNldC8zMzAyNS8xNDUzODQ4NDk1MzMyNTY5PC9ndWlkPgorICAgICAgPGRlc2NyaXB0aW9u PkRlc2NyaXB0aW9uPC9kZXNjcmlwdGlvbj4KKyAgICAgIDxjYXRlZ29yeT5jaGFuZ2VzZXQ8L2Nh dGVnb3J5PgorICAgIDwvaXRlbT4KKyAgIDwvY2hhbm5lbD4KKzwvcnNzPgpcIE5vIG5ld2xpbmUg YXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL3Rl c3RzLmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv cHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdHMuanMKaW5kZXggNTUwMjBi NTdjMzgwMGM2NmExMmE1YjExZGM2MGUzOThiNWQ2MGU5ZS4uZjJmNWIzYmNhY2ZkYjMxNTAyOTU0 ZjE2MGFlNTQ0YWVjYTQ3NDA3MiAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVz dHMvdGVzdHMuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdHMuanMKQEAg LTQ3LDYgKzQ3LDIwIEBAIHRlc3QoIl9sb2FkZWQiLCBmdW5jdGlvbigpCiAgICAgfQogfSk7CiAK K3Rlc3QoInBhcnNlIGdpdEJyYW5jaGVzIiwgZnVuY3Rpb24oKQoreworICAgIHZhciBjbGllbnQg PSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsKKyAgICBjbGllbnQub3BlbignR0VUJywgJ3Rlc3QtZml4 dHVyZS1naXQtdHJhYy1yc3MueG1sJywgZmFsc2UpOworICAgIGNsaWVudC5vbnJlYWR5c3RhdGVj aGFuZ2UgPSBmdW5jdGlvbiAoKSB7CisgICAgICAgIGlmIChjbGllbnQucmVhZHlTdGF0ZSA9PT0g Y2xpZW50LkRPTkUpCisgICAgICAgICAgICB0aGlzLnRyYWMuX2xvYWRlZChjbGllbnQucmVzcG9u c2VYTUwpOworICAgIH0uYmluZCh0aGlzKTsKKyAgICBjbGllbnQuc2VuZCgpOworICAgIHZhciBj b21taXRzID0gdGhpcy50cmFjLnJlY29yZGVkQ29tbWl0czsKKyAgICBzdHJpY3RFcXVhbChjb21t aXRzLmxlbmd0aCwgNiwgInNob3VsZCBoYXZlIDYgY29tbWl0cyIpOworICAgIG9rKGNvbW1pdHNb NV0uYnJhbmNoTmFtZS5pbmNsdWRlcygibWFzdGVyIiksICJzaG91bGQgY29udGFpbiBicmFuY2gg bWFzdGVyIik7Cit9KTsKKwogdGVzdCgiX3BhcnNlUmV2aXNpb25Gcm9tVVJMIiwgZnVuY3Rpb24o KQogewogICAgIHN0cmljdEVxdWFsKHRoaXMudHJhYy5fcGFyc2VSZXZpc2lvbkZyb21VUkwoImh0 dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8xOTA0OTciKSwgIjE5MDQ5NyIsICJTdWJ2 ZXJzaW9uIik7Cg== 270409 2016-02-01 11:44:19 -0800 2016-02-01 11:44:19 -0800 Adds git branches to the timeline RSS feed timeline.rss application/rss+xml 1398 jmarcell PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjxyc3MgdmVyc2lvbj0iMi4wIiB4bWxuczpweT0iaHR0cDov L2dlbnNoaS5lZGdld2FsbC5vcmcvIgogICAgICAgICAgICAgICAgICAgeG1sbnM6ZGM9Imh0dHA6 Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICAgICAgICAgICAgICAgICAgeG1sbnM6eGk9 Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWEluY2x1ZGUiPgogIDxjaGFubmVsPgogICAgPHRpdGxl PiR7cHJvamVjdC5uYW1lfTwvdGl0bGU+CiAgICA8bGluaz4ke2Fic19ocmVmLnRpbWVsaW5lKCl9 PC9saW5rPgogICAgPGRlc2NyaXB0aW9uPlRyYWMgVGltZWxpbmU8L2Rlc2NyaXB0aW9uPgogICAg PGxhbmd1YWdlPiR7c3RyKGxvY2FsZSkucmVwbGFjZSgnXycsICctJykgaWYgbG9jYWxlIGVsc2Ug J2VuLVVTJ308L2xhbmd1YWdlPgogICAgPGdlbmVyYXRvcj5UcmFjICR7dHJhYy52ZXJzaW9ufTwv Z2VuZXJhdG9yPgogICAgPGltYWdlIHB5OmlmPSJjaHJvbWUubG9nby5zcmNfYWJzIj4KICAgICAg PHRpdGxlPiR7cHJvamVjdC5uYW1lfTwvdGl0bGU+CiAgICAgIDx1cmw+JHtjaHJvbWUubG9nby5z cmNfYWJzfTwvdXJsPgogICAgICA8bGluaz4ke2Fic19ocmVmLnRpbWVsaW5lKCl9PC9saW5rPgog ICAgPC9pbWFnZT4KCiAgICA8aXRlbSBweTpmb3I9ImV2ZW50IGluIGV2ZW50cyIKICAgICAgICAg IHB5OndpdGg9ImFic191cmwgPSBldmVudC5yZW5kZXIoJ3VybCcsIGNvbnRleHQpIj4KICAgICAg PHRpdGxlPiR7CiAgICAgICAgcGxhaW50ZXh0KGV2ZW50LnJlbmRlcignc3VtbWFyeScsIGNvbnRl eHQpIG9yCiAgICAgICAgICAgICAgICAgIGV2ZW50LnJlbmRlcigndGl0bGUnLCBjb250ZXh0KSwg a2VlcGxpbmVicmVha3M9RmFsc2UpCiAgICAgIH08L3RpdGxlPgogICAgICA8YnJhbmNoZXM+JHsg JywgJy5qb2luKG1hcChsYW1iZGEgeDogeFswXSwgZXZlbnRbJ2V2ZW50J11bM11bMF1bMF1bMF0u Z2V0X2JyYW5jaGVzKCkpKSB9PC9icmFuY2hlcz4KICAgICAgPHhpOmluY2x1ZGUgaHJlZj0iYXV0 aG9yX29yX2NyZWF0b3IucnNzIiBweTp3aXRoPSJhdXRob3IgPSBldmVudC5hdXRob3IiLz4KICAg ICAgPHB1YkRhdGU+JHtodHRwX2RhdGUoZXZlbnQuZGF0ZSl9PC9wdWJEYXRlPgogICAgICA8bGlu az4ke2Fic191cmx9PC9saW5rPgogICAgICA8Z3VpZCBpc1Blcm1hTGluaz0iZmFsc2UiPiR7YWJz X3VybH0vJHtldmVudC5kYXRldWlkfTwvZ3VpZD4KICAgICAgPGRlc2NyaXB0aW9uPiR7CiAgICAg ICAgdW5pY29kZShldmVudC5yZW5kZXIoJ2Rlc2NyaXB0aW9uJywgY29udGV4dCkpCiAgICAgIH08 L2Rlc2NyaXB0aW9uPgogICAgICA8Y2F0ZWdvcnk+JGV2ZW50LmtpbmQ8L2NhdGVnb3J5PgogICAg PC9pdGVtPgoKICAgPC9jaGFubmVsPgo8L3Jzcz4K 270426 2016-02-01 14:35:01 -0800 2016-02-01 16:19:22 -0800 Patch bug-153624-20160201143437.patch text/plain 14509 jmarcell U3VidmVyc2lvbiBSZXZpc2lvbjogMTk1OTY4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTY5ZGExYzlkZWQ1NThmMThkYmNhYTQxNTU0NTVlNGM4 MmUxZDgyOC4uZjVjNGZiODM3NDk4YWI4NzYwNmVhMjZkMDA5OTgxMjg1ZTRjNjI2YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIz IEBACiAyMDE2LTAyLTAxICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxAYXBwbGUuY29tPgogCisg ICAgICAgIEFkZCBjb2RlIHRvIHBhcnNlIHRoZSBnaXQgYnJhbmNoZXMgb3V0IG9mIHRoZSBUcmFj IFJTUyBmZWVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTUzNjI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRt bC9kYXNoYm9hcmQvU2NyaXB0cy9UcmFjLmpzOgorICAgICAgICAoVHJhYy5wcm90b3R5cGUuY29t bWl0c09uQnJhbmNoKTogVXBkYXRlIGZpbHRlciB0byBjaGVjayBmb3IgZ2l0IGJyYW5jaGVzLgor ICAgICAgICAoVHJhYy5wcm90b3R5cGUuX2NvbnZlcnRDb21taXRJbmZvRWxlbWVudFRvT2JqZWN0 KTogUGFyc2UgZ2l0IGJyYW5jaGVzIGZyb20gdGhlIFRyYWMgUlNTIGZlZWQuIEFsc28gY2hhbmdl ZCAiYnJhbmNoTmFtZSIgdG8KKyAgICAgICAgImJyYW5jaGVzIiBhbmQgdXBkYXRlZCB0aGUgY29k ZSB0byB3b3JrIHdpdGggYW4gYXJyYXkgaW5zdGVhZCBvZiBhIHN0cmluZy4KKyAgICAgICAgKiBC dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNo Ym9hcmQvU2NyaXB0cy90ZXN0cy9Nb2NrVHJhYy5qczoKKyAgICAgICAgKE1vY2tUcmFjKTogUmVm YWN0b3JlZCBleGFtcGxlIGNvbW1pdHMgb3V0IGludG8gYSBjb25zdGFudCwgTW9ja1RyYWMuRVhB TVBMRV9UUkFDX0NPTU1JVFMuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Vi a2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdC1m aXh0dXJlLWdpdC10cmFjLXJzcy54bWw6IEFkZGVkLiBUZXN0CisgICAgICAgIGZpeHR1cmUgdGhh dCBjb250YWlucyBYTUwgd2l0aCBhIGdpdCBicmFuY2guCisgICAgICAgICogQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvdGVzdHMvdGVzdHMuanM6IEFkZGVkIHVuaXQgdGVzdCB0byB0ZXN0IHBhcnNpbmcgZ2l0Cisg ICAgICAgIGJyYW5jaGVzIGZyb20gVHJhYyBSU1MgZmVlZC4gQWxzbyB1cGRhdGVkIGNvZGUgdG8g d29yayB3aXRoIHRoZSBuZXcgTW9ja1RyYWMuRVhBTVBMRV9UUkFDX0NPTU1JVFMgY29uc3RhbnQu CisKKzIwMTYtMDItMDEgIEphc29uIE1hcmNlbGwgIDxqbWFyY2VsbEBhcHBsZS5jb20+CisKICAg ICAgICAgSW1wcm92ZW1lbnRzIHRvIGJvdHdhdGNoZXIncyBkYXNoYm9hcmQgdW5pdCB0ZXN0cy4K ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MzYyMQog CmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9UcmFjLmpzIGIvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvVHJhYy5qcwppbmRleCA0NzAzMDU5ZDMxODE0ZGNhODlmZWI5NGRmMGYxYTA5YTVj MmRjNjMyLi5hNDg4ZDFjMTZjN2JmYTAyZjI0ZGJjOGY1NTEzMjUyN2Q0ZjVlMmE4IDEwMDY0NAot LS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJs aWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9UcmFjLmpzCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3Jp cHRzL1RyYWMuanMKQEAgLTY1LDggKzY1LDggQEAgVHJhYy5wcm90b3R5cGUgPSB7CiAKICAgICBj b21taXRzT25CcmFuY2g6IGZ1bmN0aW9uKGJyYW5jaE5hbWUsIGZpbHRlcikKICAgICB7Ci0gICAg ICAgIHJldHVybiB0aGlzLnJlY29yZGVkQ29tbWl0cy5maWx0ZXIoZnVuY3Rpb24oY29tbWl0KSB7 Ci0gICAgICAgICAgICByZXR1cm4gKCFjb21taXQuY29udGFpbnNCcmFuY2hMb2NhdGlvbiB8fCBj b21taXQuYnJhbmNoTmFtZSA9PT0gYnJhbmNoTmFtZSkgJiYgZmlsdGVyKGNvbW1pdCk7CisgICAg ICAgIHJldHVybiB0aGlzLnJlY29yZGVkQ29tbWl0cy5maWx0ZXIoZnVuY3Rpb24oY29tbWl0LCBp bmRleCwgYXJyYXkpIHsKKyAgICAgICAgICAgIHJldHVybiAoIWNvbW1pdC5jb250YWluc0JyYW5j aExvY2F0aW9uIHx8IGNvbW1pdC5icmFuY2hlcy5pbmNsdWRlcyhicmFuY2hOYW1lKSkgJiYgZmls dGVyKGNvbW1pdCwgaW5kZXgsIGFycmF5KTsKICAgICAgICAgfSk7CiAgICAgfSwKIApAQCAtMTQy LDcgKzE0Miw4IEBAIFRyYWMucHJvdG90eXBlID0gewogICAgICAgICAgICAgYXV0aG9yOiBhdXRo b3IsCiAgICAgICAgICAgICBkYXRlOiBkYXRlLAogICAgICAgICAgICAgZGVzY3JpcHRpb246IHBh cnNlZERlc2NyaXB0aW9uLmlubmVySFRNTCwKLSAgICAgICAgICAgIGNvbnRhaW5zQnJhbmNoTG9j YXRpb246IGxvY2F0aW9uICE9PSAiIgorICAgICAgICAgICAgY29udGFpbnNCcmFuY2hMb2NhdGlv bjogbG9jYXRpb24gIT09ICIiLAorICAgICAgICAgICAgYnJhbmNoZXM6IFtdCiAgICAgICAgIH07 CiAKICAgICAgICAgaWYgKHJlc3VsdC5jb250YWluc0JyYW5jaExvY2F0aW9uKSB7CkBAIC0xNTEs MTEgKzE1MiwxMSBAQCBUcmFjLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGlmIChsb2NhdGlv bi5zdGFydHNXaXRoKCJ0YWdzLyIpKQogICAgICAgICAgICAgICAgIHJlc3VsdC50YWcgPSBsb2Nh dGlvbi5zdWJzdHIoNSwgbG9jYXRpb24uaW5kZXhPZigiLyIsIDUpIC0gNSk7CiAgICAgICAgICAg ICBlbHNlIGlmIChsb2NhdGlvbi5zdGFydHNXaXRoKCJicmFuY2hlcy8iKSkKLSAgICAgICAgICAg ICAgICByZXN1bHQuYnJhbmNoTmFtZSA9IGxvY2F0aW9uLnN1YnN0cig5LCBsb2NhdGlvbi5pbmRl eE9mKCIvIiwgOSkgLSA5KTsKKyAgICAgICAgICAgICAgICByZXN1bHQuYnJhbmNoZXMucHVzaChs b2NhdGlvbi5zdWJzdHIoOSwgbG9jYXRpb24uaW5kZXhPZigiLyIsIDkpIC0gOSkpOwogICAgICAg ICAgICAgZWxzZSBpZiAobG9jYXRpb24uc3RhcnRzV2l0aCgicmVsZWFzZXMvIikpCiAgICAgICAg ICAgICAgICAgcmVzdWx0LnJlbGVhc2UgPSBsb2NhdGlvbi5zdWJzdHIoOSwgbG9jYXRpb24uaW5k ZXhPZigiLyIsIDkpIC0gOSk7CiAgICAgICAgICAgICBlbHNlIGlmIChsb2NhdGlvbi5zdGFydHNX aXRoKCJ0cnVuay8iKSkKLSAgICAgICAgICAgICAgICByZXN1bHQuYnJhbmNoTmFtZSA9ICJ0cnVu ayI7CisgICAgICAgICAgICAgICAgcmVzdWx0LmJyYW5jaGVzLnB1c2goInRydW5rIik7CiAgICAg ICAgICAgICBlbHNlIGlmIChsb2NhdGlvbi5zdGFydHNXaXRoKCJzdWJtaXNzaW9ucy8iKSkKICAg ICAgICAgICAgICAgICA7IC8vIFRoZXNlIGNoYW5nZXMgYXJlIG5ldmVyIHJlbGV2YW50IHRvIHRo ZSBkYXNoYm9hcmQuCiAgICAgICAgICAgICBlbHNlIHsKQEAgLTE2NSw2ICsxNjYsMTIgQEAgVHJh Yy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAorICAgICAgICB2YXIg Z2l0QnJhbmNoZXMgPSBkb2MuZXZhbHVhdGUoIi4vYnJhbmNoZXMiLCBjb21taXRFbGVtZW50LCBu dWxsLCBYUGF0aFJlc3VsdC5TVFJJTkdfVFlQRSkuc3RyaW5nVmFsdWU7CisgICAgICAgIGlmIChn aXRCcmFuY2hlcykgeworICAgICAgICAgICAgcmVzdWx0LmNvbnRhaW5zQnJhbmNoTG9jYXRpb24g PSB0cnVlOworICAgICAgICAgICAgcmVzdWx0LmJyYW5jaGVzID0gcmVzdWx0LmJyYW5jaGVzLmNv bmNhdChnaXRCcmFuY2hlcy5zcGxpdCgiLCAiKSk7CisgICAgICAgIH0KKwogICAgICAgICByZXR1 cm4gcmVzdWx0OwogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rl c3RzL01vY2tUcmFjLmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvTW9ja1RyYWMuanMK aW5kZXggYjk2ZDEzYjhkOTk3ZjdlM2U2YjlhZDlmNmQyMTEwNjk4ZTY3ZDg0Mi4uNjBmNTUwMmI0 NTI0YTdkNmRjYjFhZDdiMzY3ZWQ3OGEzOGVlOTc2MSAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvdGVzdHMvTW9ja1RyYWMuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVz dHMvTW9ja1RyYWMuanMKQEAgLTI2LDU4ICsyNiw2IEBACiBNb2NrVHJhYyA9IGZ1bmN0aW9uKCkK IHsKICAgICBUcmFjLmNhbGwodGhpcywgImh0dHBzOi8vdHJhYy53ZWJraXQub3JnLyIpOwotICAg IHRoaXMucmVjb3JkZWRDb21taXRzID0gWwotICAgICAgICB7Ci0gICAgICAgICAgICAicmV2aXNp b25OdW1iZXIiOiAzMzAxOCwKLSAgICAgICAgICAgICJsaW5rIjogImh0dHBzOi8vdHJhYy53ZWJr aXQub3JnL2NoYW5nZXNldC8zMzAxOCIsCi0gICAgICAgICAgICAidGl0bGUiOiB7IGlubmVySFRN TDogImNvbW1pdCBtZXNzYWdlIiB9LAotICAgICAgICAgICAgImF1dGhvciI6ICJqb2huQHdlYmtp dC5vcmciLAotICAgICAgICAgICAgImRhdGUiOiBuZXcgRGF0ZSgiMjAxNS0xMS0xNVQxNzowNTo0 NC4wMDBaIiksCi0gICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiZGVzY3JpcHRpb24iLAotICAg ICAgICAgICAgImNvbnRhaW5zQnJhbmNoTG9jYXRpb24iOiB0cnVlLAotICAgICAgICAgICAgImJy YW5jaE5hbWUiOiAidHJ1bmsiCi0gICAgICAgIH0sCi0gICAgICAgIHsKLSAgICAgICAgICAgICJy ZXZpc2lvbk51bWJlciI6IDMzMDE5LAotICAgICAgICAgICAgImxpbmsiOiAiaHR0cHM6Ly90cmFj LndlYmtpdC5vcmcvY2hhbmdlc2V0LzMzMDE5IiwKLSAgICAgICAgICAgICJ0aXRsZSI6IHsgaW5u ZXJIVE1MOiAiY29tbWl0IG1lc3NhZ2UiIH0sCi0gICAgICAgICAgICAiYXV0aG9yIjogInBhdWxA d2Via2l0Lm9yZyIsCi0gICAgICAgICAgICAiZGF0ZSI6IG5ldyBEYXRlKCIyMDE1LTExLTE2VDAx OjE4OjIzLjAwMFoiKSwKLSAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJkZXNjcmlwdGlvbiIs Ci0gICAgICAgICAgICAiY29udGFpbnNCcmFuY2hMb2NhdGlvbiI6IHRydWUsCi0gICAgICAgICAg ICAiYnJhbmNoTmFtZSI6ICJzb21lT3RoZXJCcmFuY2giCi0gICAgICAgIH0sCi0gICAgICAgIHsK LSAgICAgICAgICAgICJyZXZpc2lvbk51bWJlciI6IDMzMDIwLAotICAgICAgICAgICAgImxpbmsi OiAiaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzMzMDIwIiwKLSAgICAgICAgICAg ICJ0aXRsZSI6IHsgaW5uZXJIVE1MOiAiY29tbWl0IG1lc3NhZ2UiIH0sCi0gICAgICAgICAgICAi YXV0aG9yIjogImdlb3JnZUB3ZWJraXQub3JnIiwKLSAgICAgICAgICAgICJkYXRlIjogbmV3IERh dGUoIjIwMTUtMTEtMTZUMDE6MTk6MjcuMDAwWiIpLAotICAgICAgICAgICAgImRlc2NyaXB0aW9u IjogImRlc2NyaXB0aW9uIiwKLSAgICAgICAgICAgICJjb250YWluc0JyYW5jaExvY2F0aW9uIjog dHJ1ZSwKLSAgICAgICAgICAgICJicmFuY2hOYW1lIjogInRydW5rIgotICAgICAgICB9LAotICAg ICAgICB7Ci0gICAgICAgICAgICAicmV2aXNpb25OdW1iZXIiOiAzMzAyMSwKLSAgICAgICAgICAg ICJsaW5rIjogImh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8zMzAyMSIsCi0gICAg ICAgICAgICAidGl0bGUiOiB7IGlubmVySFRNTDogImNvbW1pdCBtZXNzYWdlIiB9LAotICAgICAg ICAgICAgImF1dGhvciI6ICJyaW5nb0B3ZWJraXQub3JnIiwKLSAgICAgICAgICAgICJkYXRlIjog bmV3IERhdGUoIjIwMTUtMTEtMTZUMDE6MjA6NTguMDAwWiIpLAotICAgICAgICAgICAgImRlc2Ny aXB0aW9uIjogImRlc2NyaXB0aW9uIiwKLSAgICAgICAgICAgICJjb250YWluc0JyYW5jaExvY2F0 aW9uIjogdHJ1ZSwKLSAgICAgICAgICAgICJicmFuY2hOYW1lIjogInNvbWVPdGhlckJyYW5jaCIK LSAgICAgICAgfSwKLSAgICAgICAgewotICAgICAgICAgICAgInJldmlzaW9uTnVtYmVyIjogMzMw MjIsCi0gICAgICAgICAgICAibGluayI6ICJodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2Vz ZXQvMzMwMjIiLAotICAgICAgICAgICAgInRpdGxlIjogeyBpbm5lckhUTUw6ICJjb21taXQgbWVz c2FnZSIgfSwKLSAgICAgICAgICAgICJhdXRob3IiOiAiYm9iQHdlYmtpdC5vcmciLAotICAgICAg ICAgICAgImRhdGUiOiBuZXcgRGF0ZSgiMjAxNS0xMS0xNlQwMToyMjowMS4wMDBaIiksCi0gICAg ICAgICAgICAiZGVzY3JpcHRpb24iOiAiZGVzY3JpcHRpb24iLAotICAgICAgICAgICAgImNvbnRh aW5zQnJhbmNoTG9jYXRpb24iOiB0cnVlLAotICAgICAgICAgICAgImJyYW5jaE5hbWUiOiAidHJ1 bmsiCi0gICAgICAgIH0KLSAgICBdOwogfTsKIAogQmFzZU9iamVjdC5hZGRDb25zdHJ1Y3RvckZ1 bmN0aW9ucyhNb2NrVHJhYyk7CkBAIC0xMDAsMyArNDgsNTYgQEAgTW9ja1RyYWMucHJvdG90eXBl ID0gewogICAgIHsKICAgICB9LAogfTsKKworTW9ja1RyYWMuRVhBTVBMRV9UUkFDX0NPTU1JVFMg PSBbCisgICAgeworICAgICAgICAicmV2aXNpb25OdW1iZXIiOiAzMzAxOCwKKyAgICAgICAgImxp bmsiOiAiaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzMzMDE4IiwKKyAgICAgICAg InRpdGxlIjogeyBpbm5lckhUTUw6ICJjb21taXQgbWVzc2FnZSIgfSwKKyAgICAgICAgImF1dGhv ciI6ICJqb2huQHdlYmtpdC5vcmciLAorICAgICAgICAiZGF0ZSI6IG5ldyBEYXRlKCIyMDE1LTEx LTE1VDE3OjA1OjQ0LjAwMFoiKSwKKyAgICAgICAgImRlc2NyaXB0aW9uIjogImRlc2NyaXB0aW9u IiwKKyAgICAgICAgImNvbnRhaW5zQnJhbmNoTG9jYXRpb24iOiB0cnVlLAorICAgICAgICAiYnJh bmNoZXMiOiBbInRydW5rIl0KKyAgICB9LAorICAgIHsKKyAgICAgICAgInJldmlzaW9uTnVtYmVy IjogMzMwMTksCisgICAgICAgICJsaW5rIjogImh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5n ZXNldC8zMzAxOSIsCisgICAgICAgICJ0aXRsZSI6IHsgaW5uZXJIVE1MOiAiY29tbWl0IG1lc3Nh Z2UiIH0sCisgICAgICAgICJhdXRob3IiOiAicGF1bEB3ZWJraXQub3JnIiwKKyAgICAgICAgImRh dGUiOiBuZXcgRGF0ZSgiMjAxNS0xMS0xNlQwMToxODoyMy4wMDBaIiksCisgICAgICAgICJkZXNj cmlwdGlvbiI6ICJkZXNjcmlwdGlvbiIsCisgICAgICAgICJjb250YWluc0JyYW5jaExvY2F0aW9u IjogdHJ1ZSwKKyAgICAgICAgImJyYW5jaGVzIjogWyJzb21lT3RoZXJCcmFuY2giXQorICAgIH0s CisgICAgeworICAgICAgICAicmV2aXNpb25OdW1iZXIiOiAzMzAyMCwKKyAgICAgICAgImxpbmsi OiAiaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzMzMDIwIiwKKyAgICAgICAgInRp dGxlIjogeyBpbm5lckhUTUw6ICJjb21taXQgbWVzc2FnZSIgfSwKKyAgICAgICAgImF1dGhvciI6 ICJnZW9yZ2VAd2Via2l0Lm9yZyIsCisgICAgICAgICJkYXRlIjogbmV3IERhdGUoIjIwMTUtMTEt MTZUMDE6MTk6MjcuMDAwWiIpLAorICAgICAgICAiZGVzY3JpcHRpb24iOiAiZGVzY3JpcHRpb24i LAorICAgICAgICAiY29udGFpbnNCcmFuY2hMb2NhdGlvbiI6IHRydWUsCisgICAgICAgICJicmFu Y2hlcyI6IFsidHJ1bmsiXQorICAgIH0sCisgICAgeworICAgICAgICAicmV2aXNpb25OdW1iZXIi OiAzMzAyMSwKKyAgICAgICAgImxpbmsiOiAiaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdl c2V0LzMzMDIxIiwKKyAgICAgICAgInRpdGxlIjogeyBpbm5lckhUTUw6ICJjb21taXQgbWVzc2Fn ZSIgfSwKKyAgICAgICAgImF1dGhvciI6ICJyaW5nb0B3ZWJraXQub3JnIiwKKyAgICAgICAgImRh dGUiOiBuZXcgRGF0ZSgiMjAxNS0xMS0xNlQwMToyMDo1OC4wMDBaIiksCisgICAgICAgICJkZXNj cmlwdGlvbiI6ICJkZXNjcmlwdGlvbiIsCisgICAgICAgICJjb250YWluc0JyYW5jaExvY2F0aW9u IjogdHJ1ZSwKKyAgICAgICAgImJyYW5jaGVzIjogWyJzb21lT3RoZXJCcmFuY2giXQorICAgIH0s CisgICAgeworICAgICAgICAicmV2aXNpb25OdW1iZXIiOiAzMzAyMiwKKyAgICAgICAgImxpbmsi OiAiaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzMzMDIyIiwKKyAgICAgICAgInRp dGxlIjogeyBpbm5lckhUTUw6ICJjb21taXQgbWVzc2FnZSIgfSwKKyAgICAgICAgImF1dGhvciI6 ICJib2JAd2Via2l0Lm9yZyIsCisgICAgICAgICJkYXRlIjogbmV3IERhdGUoIjIwMTUtMTEtMTZU MDE6MjI6MDEuMDAwWiIpLAorICAgICAgICAiZGVzY3JpcHRpb24iOiAiZGVzY3JpcHRpb24iLAor ICAgICAgICAiY29udGFpbnNCcmFuY2hMb2NhdGlvbiI6IHRydWUsCisgICAgICAgICJicmFuY2hl cyI6IFsidHJ1bmsiXQorICAgIH0KK107ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZm IC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv cHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdC1maXh0dXJlLWdpdC10cmFj LXJzcy54bWwgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy90ZXN0LWZpeHR1cmUtZ2l0LXRy YWMtcnNzLnhtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wMGI4NTk4NjAwMjI4ZDU3ZTc5ZDVkYzBjMzczM2JmNGE1 ODQ0MmM5Ci0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQu d2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVz dC1maXh0dXJlLWdpdC10cmFjLXJzcy54bWwKQEAgLTAsMCArMSw2NCBAQAorPD94bWwgdmVyc2lv bj0iMS4wIj8+Cis8IS0tCitDb3B5cmlnaHQgKEMpIDIwMTYgQXBwbGUsIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKworUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Cittb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKK2FyZSBtZXQ6CisxLiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAor ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyLgorMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNl IHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAgIGRvY3VtZW50YXRpb24gYW5k L29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisKK1RI SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9S UyBgYEFTIElTJycKK0FORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJD SEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorUFVSUE9TRSBBUkUgRElT Q0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JT CitCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFM LCBFWEVNUExBUlksIE9SCitDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5P VCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNF UzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCitJTlRFUlJVUFRJ T04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhF UiBJTgorQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdM SUdFTkNFIE9SIE9USEVSV0lTRSkKK0FSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKK1RIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KKy0tPgorCis8cnNzIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxl bWVudHMvMS4xLyIgdmVyc2lvbj0iMi4wIj4KKyAgPGNoYW5uZWw+CisgICAgPHRpdGxlPldlYktp dDwvdGl0bGU+CisgICAgPGxpbms+aHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvdGltZWxpbmU8L2xp bms+CisgICAgPGRlc2NyaXB0aW9uPlRyYWMgVGltZWxpbmU8L2Rlc2NyaXB0aW9uPgorICAgIDxs YW5ndWFnZT5lbi1VUzwvbGFuZ3VhZ2U+CisgICAgPGdlbmVyYXRvcj5UcmFjIDAuMTIuMzwvZ2Vu ZXJhdG9yPgorICAgIDxpbWFnZT4KKyAgICAgIDx0aXRsZT5XZWJLaXQ8L3RpdGxlPgorICAgICAg PHVybD5odHRwczovL3RyYWMud2Via2l0Lm9yZy9jaHJvbWUvc2l0ZS9mYXZpY29uLnBuZzwvdXJs PgorICAgICAgPGxpbms+aHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvdGltZWxpbmU8L2xpbms+Cisg ICAgPC9pbWFnZT4KKyAgICA8aXRlbT4KKyAgICAgIDx0aXRsZT5DaGFuZ2VzZXQgWzMzMDI1XTog SXRhIHByb3JzdXMgaW5xdWFtIEFkIGNvcnB1cyBkaWNlcmVzIHBlcnRpbmVyZSwgc2VkIGVhLCBx dWFlIGRpeGk8L3RpdGxlPgorICAgICAgPGJyYW5jaGVzPm1hc3Rlciwgc29tZU90aGVyQnJhbmNo PC9icmFuY2hlcz4KKyAgICAgIAorICAgICAgICA8YXV0aG9yPmdlb3JnZUB3ZWJraXQub3JnPC9h dXRob3I+CisKKyAgICAgIDxwdWJEYXRlPlR1ZSwgMjYgSmFuIDIwMTYgMjI6NDg6MTUgR01UPC9w dWJEYXRlPgorICAgICAgPGxpbms+aHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzMz MDI1PC9saW5rPgorICAgICAgPGd1aWQgaXNQZXJtYUxpbms9ImZhbHNlIj5odHRwczovL3RyYWMu d2Via2l0Lm9yZy9jaGFuZ2VzZXQvMzMwMjUvMTQ1Mzg0ODQ5NTMzMjU2OTwvZ3VpZD4KKyAgICAg IDxkZXNjcmlwdGlvbj5EZXNjcmlwdGlvbjwvZGVzY3JpcHRpb24+CisgICAgICA8Y2F0ZWdvcnk+ Y2hhbmdlc2V0PC9jYXRlZ29yeT4KKyAgICA8L2l0ZW0+CisgICAgPGl0ZW0+CisgICAgICA8dGl0 bGU+Q2hhbmdlc2V0IFszMzAyNF06IEFuIGV1bSBkaXNjZXJlIGVhIG1hdmlzLCBxdWFlIGN1bSBw bGFuZSBwZXJkaWRpY2VyaXRpIG5paGlsIHNjaWF0PC90aXRsZT4KKyAgICAgIDxicmFuY2hlcz5t YXN0ZXI8L2JyYW5jaGVzPgorCisgICAgICAgIDxhdXRob3I+cGF1bEB3ZWJraXQub3JnPC9hdXRo b3I+CisKKyAgICAgIDxwdWJEYXRlPlR1ZSwgMjYgSmFuIDIwMTYgMjI6MjI6MjUgR01UPC9wdWJE YXRlPgorICAgICAgPGxpbms+aHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzMzMDI0 PC9saW5rPgorICAgICAgPGd1aWQgaXNQZXJtYUxpbms9ImZhbHNlIj5odHRwczovL3RyYWMud2Vi a2l0Lm9yZy9jaGFuZ2VzZXQvMzMwMjQvMTQ1Mzg0Njk0NTI0NDAwNzwvZ3VpZD4KKyAgICAgIDxk ZXNjcmlwdGlvbj5EZXNjcmlwdGlvbjwvZGVzY3JpcHRpb24+CisgICAgICA8Y2F0ZWdvcnk+Y2hh bmdlc2V0PC9jYXRlZ29yeT4KKyAgICA8L2l0ZW0+CisgICA8L2NoYW5uZWw+Cis8L3Jzcz4KXCBO byBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0 cy90ZXN0cy90ZXN0cy5qcyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL3Rlc3RzLmpzCmlu ZGV4IDU1MDIwYjU3YzM4MDBjNjZhMTJhNWIxMWRjNjBlMzk4YjVkNjBlOWUuLjAwNDkzMGVjNmFi ZGRjNDdkOGYyMTgyMWE2YjdjYWY4ODExNDdlYWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9T Y3JpcHRzL3Rlc3RzL3Rlc3RzLmpzCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL3Rl c3RzLmpzCkBAIC0zMSw2ICszMSw3IEBAIG1vZHVsZSgiVHJhYyIsIHsKIAogdGVzdCgiX2xvYWRl ZCIsIGZ1bmN0aW9uKCkKIHsKKyAgICB0aGlzLnRyYWMucmVjb3JkZWRDb21taXRzID0gTW9ja1Ry YWMuRVhBTVBMRV9UUkFDX0NPTU1JVFM7CiAgICAgdmFyIGNsaWVudCA9IG5ldyBYTUxIdHRwUmVx dWVzdCgpOwogICAgIGNsaWVudC5vcGVuKCdHRVQnLCAndGVzdC1maXh0dXJlLXRyYWMtcnNzLnht bCcsIGZhbHNlKTsKICAgICBjbGllbnQub25yZWFkeXN0YXRlY2hhbmdlID0gZnVuY3Rpb24gKCkg ewpAQCAtNDcsNiArNDgsMjQgQEAgdGVzdCgiX2xvYWRlZCIsIGZ1bmN0aW9uKCkKICAgICB9CiB9 KTsKIAordGVzdCgicGFyc2UgZ2l0QnJhbmNoZXMiLCBmdW5jdGlvbigpCit7CisgICAgdmFyIGNs aWVudCA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOworICAgIGNsaWVudC5vcGVuKCdHRVQnLCAndGVz dC1maXh0dXJlLWdpdC10cmFjLXJzcy54bWwnLCBmYWxzZSk7CisgICAgY2xpZW50Lm9ucmVhZHlz dGF0ZWNoYW5nZSA9IGZ1bmN0aW9uICgpIHsKKyAgICAgICAgaWYgKGNsaWVudC5yZWFkeVN0YXRl ID09PSBjbGllbnQuRE9ORSkKKyAgICAgICAgICAgIHRoaXMudHJhYy5fbG9hZGVkKGNsaWVudC5y ZXNwb25zZVhNTCk7CisgICAgfS5iaW5kKHRoaXMpOworICAgIGNsaWVudC5zZW5kKCk7CisgICAg dmFyIGNvbW1pdHMgPSB0aGlzLnRyYWMucmVjb3JkZWRDb21taXRzOworICAgIHN0cmljdEVxdWFs KGNvbW1pdHMubGVuZ3RoLCAyLCAic2hvdWxkIGhhdmUgMiBjb21taXRzIik7CisgICAgc3RyaWN0 RXF1YWwoY29tbWl0c1swXS5icmFuY2hlcy5sZW5ndGgsIDEsICJzaG91bGQgaGF2ZSBvbmUgYnJh bmNoIik7CisgICAgc3RyaWN0RXF1YWwoY29tbWl0c1swXS5icmFuY2hlcy5pbmNsdWRlcygibWFz dGVyIiksIHRydWUsICJzaG91bGQgY29udGFpbiBicmFuY2ggbWFzdGVyIik7CisgICAgc3RyaWN0 RXF1YWwoY29tbWl0c1sxXS5icmFuY2hlcy5sZW5ndGgsIDIsICJzaG91bGQgaGF2ZSB0d28gYnJh bmNoZXMiKTsKKyAgICBzdHJpY3RFcXVhbChjb21taXRzWzFdLmJyYW5jaGVzLmluY2x1ZGVzKCJt YXN0ZXIiKSwgdHJ1ZSwgInNob3VsZCBjb250YWluIGJyYW5jaCBtYXN0ZXIiKTsKKyAgICBzdHJp Y3RFcXVhbChjb21taXRzWzFdLmJyYW5jaGVzLmluY2x1ZGVzKCJzb21lT3RoZXJCcmFuY2giKSwg dHJ1ZSwgInNob3VsZCBjb250YWluIGJyYW5jaCBzb21lT3RoZXJCcmFuY2giKTsKK30pOworCiB0 ZXN0KCJfcGFyc2VSZXZpc2lvbkZyb21VUkwiLCBmdW5jdGlvbigpCiB7CiAgICAgc3RyaWN0RXF1 YWwodGhpcy50cmFjLl9wYXJzZVJldmlzaW9uRnJvbVVSTCgiaHR0cHM6Ly90cmFjLndlYmtpdC5v cmcvY2hhbmdlc2V0LzE5MDQ5NyIpLCAiMTkwNDk3IiwgIlN1YnZlcnNpb24iKTsKQEAgLTU3LDYg Kzc2LDcgQEAgdGVzdCgiX3BhcnNlUmV2aXNpb25Gcm9tVVJMIiwgZnVuY3Rpb24oKQogbW9kdWxl KCJCdWlsZEJvdFF1ZXVlVmlldyIsIHsKICAgICBzZXR1cDogZnVuY3Rpb24oKSB7CiAgICAgICAg IHRoaXMudHJhYyA9IG5ldyBNb2NrVHJhYygpOworICAgICAgICB0aGlzLnRyYWMucmVjb3JkZWRD b21taXRzID0gTW9ja1RyYWMuRVhBTVBMRV9UUkFDX0NPTU1JVFM7CiAgICAgICAgIHRoaXMucXVl dWUgPSBuZXcgTW9ja0J1aWxkYm90UXVldWUoKTsKICAgICAgICAgdGhpcy50cnVua0JyYW5jaCA9 IHsKICAgICAgICAgICAgIG5hbWU6ICJ0cnVuayIsCg== 270448 2016-02-01 16:19:26 -0800 2016-02-01 16:28:28 -0800 Patch bug-153624-20160201161902.patch text/plain 15233 jmarcell U3VidmVyc2lvbiBSZXZpc2lvbjogMTk1OTg1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGM3NDhiMThhYzZkODEzNTQ0YmY5M2U4NTRhOTBlYmI1 Zjg0ZTU3MS4uN2FmNzcxNDVhMmEyZjFmZDZjMzA0NTUxYWUwNTA1ZGRlMDRjNzVkZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDE2LTAyLTAxICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxAYXBwbGUuY29tPgorCisg ICAgICAgIEFkZCBjb2RlIHRvIHBhcnNlIHRoZSBnaXQgYnJhbmNoZXMgb3V0IG9mIHRoZSBUcmFj IFJTUyBmZWVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTUzNjI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRt bC9kYXNoYm9hcmQvU2NyaXB0cy9UcmFjLmpzOgorICAgICAgICAoVHJhYy5wcm90b3R5cGUuY29t bWl0c09uQnJhbmNoKTogVXBkYXRlIGZpbHRlciB0byBjaGVjayBmb3IgZ2l0IGJyYW5jaGVzLgor ICAgICAgICAoVHJhYy5wcm90b3R5cGUuX2NvbnZlcnRDb21taXRJbmZvRWxlbWVudFRvT2JqZWN0 KTogUGFyc2UgZ2l0IGJyYW5jaGVzIGZyb20gdGhlIFRyYWMgUlNTIGZlZWQuIEFsc28gY2hhbmdl ZCAiYnJhbmNoTmFtZSIgdG8KKyAgICAgICAgImJyYW5jaGVzIiBhbmQgdXBkYXRlZCB0aGUgY29k ZSB0byB3b3JrIHdpdGggYW4gYXJyYXkgaW5zdGVhZCBvZiBhIHN0cmluZy4KKyAgICAgICAgKiBC dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNo Ym9hcmQvU2NyaXB0cy90ZXN0cy9Nb2NrVHJhYy5qczoKKyAgICAgICAgKE1vY2tUcmFjKTogUmVm YWN0b3JlZCBleGFtcGxlIGNvbW1pdHMgb3V0IGludG8gYSBjb25zdGFudCwgTW9ja1RyYWMuRVhB TVBMRV9UUkFDX0NPTU1JVFMuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Vi a2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdC1m aXh0dXJlLWdpdC10cmFjLXJzcy54bWw6IEFkZGVkLiBUZXN0CisgICAgICAgIGZpeHR1cmUgdGhh dCBjb250YWlucyBYTUwgd2l0aCBhIGdpdCBicmFuY2guCisgICAgICAgICogQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvdGVzdHMvdGVzdHMuanM6IEFkZGVkIHVuaXQgdGVzdCB0byB0ZXN0IHBhcnNpbmcgZ2l0Cisg ICAgICAgIGJyYW5jaGVzIGZyb20gVHJhYyBSU1MgZmVlZC4gQWxzbyB1cGRhdGVkIGNvZGUgdG8g d29yayB3aXRoIHRoZSBuZXcgTW9ja1RyYWMuRVhBTVBMRV9UUkFDX0NPTU1JVFMgY29uc3RhbnQu CisKIDIwMTYtMDItMDEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAg ICAgIEFkZCBjb21tYW5kIGxpbmUgZmxhZyB0byBEUlQgdG8gb3V0cHV0IHRoZSBudW1iZXIgb2Yg dGVzdHMgY29tcGxldGVkIGluIHNlcnZlciBtb2RlLgpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvVHJhYy5qcyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1RyYWMuanMKaW5kZXggNDcw MzA1OWQzMTgxNGRjYTg5ZmViOTRkZjBmMWEwOWE1YzJkYzYzMi4uYTQ4OGQxYzE2YzdiZmEwMmYy NGRiYzhmNTUxMzI1MjdkNGY1ZTJhOCAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMv VHJhYy5qcworKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9UcmFjLmpzCkBAIC02NSw4ICs2NSw4 IEBAIFRyYWMucHJvdG90eXBlID0gewogCiAgICAgY29tbWl0c09uQnJhbmNoOiBmdW5jdGlvbihi cmFuY2hOYW1lLCBmaWx0ZXIpCiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5yZWNvcmRlZENv bW1pdHMuZmlsdGVyKGZ1bmN0aW9uKGNvbW1pdCkgewotICAgICAgICAgICAgcmV0dXJuICghY29t bWl0LmNvbnRhaW5zQnJhbmNoTG9jYXRpb24gfHwgY29tbWl0LmJyYW5jaE5hbWUgPT09IGJyYW5j aE5hbWUpICYmIGZpbHRlcihjb21taXQpOworICAgICAgICByZXR1cm4gdGhpcy5yZWNvcmRlZENv bW1pdHMuZmlsdGVyKGZ1bmN0aW9uKGNvbW1pdCwgaW5kZXgsIGFycmF5KSB7CisgICAgICAgICAg ICByZXR1cm4gKCFjb21taXQuY29udGFpbnNCcmFuY2hMb2NhdGlvbiB8fCBjb21taXQuYnJhbmNo ZXMuaW5jbHVkZXMoYnJhbmNoTmFtZSkpICYmIGZpbHRlcihjb21taXQsIGluZGV4LCBhcnJheSk7 CiAgICAgICAgIH0pOwogICAgIH0sCiAKQEAgLTE0Miw3ICsxNDIsOCBAQCBUcmFjLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIGF1dGhvcjogYXV0aG9yLAogICAgICAgICAgICAgZGF0ZTogZGF0 ZSwKICAgICAgICAgICAgIGRlc2NyaXB0aW9uOiBwYXJzZWREZXNjcmlwdGlvbi5pbm5lckhUTUws Ci0gICAgICAgICAgICBjb250YWluc0JyYW5jaExvY2F0aW9uOiBsb2NhdGlvbiAhPT0gIiIKKyAg ICAgICAgICAgIGNvbnRhaW5zQnJhbmNoTG9jYXRpb246IGxvY2F0aW9uICE9PSAiIiwKKyAgICAg ICAgICAgIGJyYW5jaGVzOiBbXQogICAgICAgICB9OwogCiAgICAgICAgIGlmIChyZXN1bHQuY29u dGFpbnNCcmFuY2hMb2NhdGlvbikgewpAQCAtMTUxLDExICsxNTIsMTEgQEAgVHJhYy5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICBpZiAobG9jYXRpb24uc3RhcnRzV2l0aCgidGFncy8iKSkKICAg ICAgICAgICAgICAgICByZXN1bHQudGFnID0gbG9jYXRpb24uc3Vic3RyKDUsIGxvY2F0aW9uLmlu ZGV4T2YoIi8iLCA1KSAtIDUpOwogICAgICAgICAgICAgZWxzZSBpZiAobG9jYXRpb24uc3RhcnRz V2l0aCgiYnJhbmNoZXMvIikpCi0gICAgICAgICAgICAgICAgcmVzdWx0LmJyYW5jaE5hbWUgPSBs b2NhdGlvbi5zdWJzdHIoOSwgbG9jYXRpb24uaW5kZXhPZigiLyIsIDkpIC0gOSk7CisgICAgICAg ICAgICAgICAgcmVzdWx0LmJyYW5jaGVzLnB1c2gobG9jYXRpb24uc3Vic3RyKDksIGxvY2F0aW9u LmluZGV4T2YoIi8iLCA5KSAtIDkpKTsKICAgICAgICAgICAgIGVsc2UgaWYgKGxvY2F0aW9uLnN0 YXJ0c1dpdGgoInJlbGVhc2VzLyIpKQogICAgICAgICAgICAgICAgIHJlc3VsdC5yZWxlYXNlID0g bG9jYXRpb24uc3Vic3RyKDksIGxvY2F0aW9uLmluZGV4T2YoIi8iLCA5KSAtIDkpOwogICAgICAg ICAgICAgZWxzZSBpZiAobG9jYXRpb24uc3RhcnRzV2l0aCgidHJ1bmsvIikpCi0gICAgICAgICAg ICAgICAgcmVzdWx0LmJyYW5jaE5hbWUgPSAidHJ1bmsiOworICAgICAgICAgICAgICAgIHJlc3Vs dC5icmFuY2hlcy5wdXNoKCJ0cnVuayIpOwogICAgICAgICAgICAgZWxzZSBpZiAobG9jYXRpb24u c3RhcnRzV2l0aCgic3VibWlzc2lvbnMvIikpCiAgICAgICAgICAgICAgICAgOyAvLyBUaGVzZSBj aGFuZ2VzIGFyZSBuZXZlciByZWxldmFudCB0byB0aGUgZGFzaGJvYXJkLgogICAgICAgICAgICAg ZWxzZSB7CkBAIC0xNjUsNiArMTY2LDEyIEBAIFRyYWMucHJvdG90eXBlID0gewogICAgICAgICAg ICAgfQogICAgICAgICB9CiAKKyAgICAgICAgdmFyIGdpdEJyYW5jaGVzID0gZG9jLmV2YWx1YXRl KCIuL2JyYW5jaGVzIiwgY29tbWl0RWxlbWVudCwgbnVsbCwgWFBhdGhSZXN1bHQuU1RSSU5HX1RZ UEUpLnN0cmluZ1ZhbHVlOworICAgICAgICBpZiAoZ2l0QnJhbmNoZXMpIHsKKyAgICAgICAgICAg IHJlc3VsdC5jb250YWluc0JyYW5jaExvY2F0aW9uID0gdHJ1ZTsKKyAgICAgICAgICAgIHJlc3Vs dC5icmFuY2hlcyA9IHJlc3VsdC5icmFuY2hlcy5jb25jYXQoZ2l0QnJhbmNoZXMuc3BsaXQoIiwg IikpOworICAgICAgICB9CisKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9LAogCmRpZmYg LS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9w dWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy9Nb2NrVHJhYy5qcyBiL1Rvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hi b2FyZC9TY3JpcHRzL3Rlc3RzL01vY2tUcmFjLmpzCmluZGV4IGI5NmQxM2I4ZDk5N2Y3ZTNlNmI5 YWQ5ZjZkMjExMDY5OGU2N2Q4NDIuLjYwZjU1MDJiNDUyNGE3ZDZkY2IxYWQ3YjM2N2VkNzhhMzhl ZTk3NjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL01vY2tUcmFjLmpz CisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1 YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL01vY2tUcmFjLmpzCkBAIC0yNiw1OCAr MjYsNiBAQAogTW9ja1RyYWMgPSBmdW5jdGlvbigpCiB7CiAgICAgVHJhYy5jYWxsKHRoaXMsICJo dHRwczovL3RyYWMud2Via2l0Lm9yZy8iKTsKLSAgICB0aGlzLnJlY29yZGVkQ29tbWl0cyA9IFsK LSAgICAgICAgewotICAgICAgICAgICAgInJldmlzaW9uTnVtYmVyIjogMzMwMTgsCi0gICAgICAg ICAgICAibGluayI6ICJodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMzMwMTgiLAot ICAgICAgICAgICAgInRpdGxlIjogeyBpbm5lckhUTUw6ICJjb21taXQgbWVzc2FnZSIgfSwKLSAg ICAgICAgICAgICJhdXRob3IiOiAiam9obkB3ZWJraXQub3JnIiwKLSAgICAgICAgICAgICJkYXRl IjogbmV3IERhdGUoIjIwMTUtMTEtMTVUMTc6MDU6NDQuMDAwWiIpLAotICAgICAgICAgICAgImRl c2NyaXB0aW9uIjogImRlc2NyaXB0aW9uIiwKLSAgICAgICAgICAgICJjb250YWluc0JyYW5jaExv Y2F0aW9uIjogdHJ1ZSwKLSAgICAgICAgICAgICJicmFuY2hOYW1lIjogInRydW5rIgotICAgICAg ICB9LAotICAgICAgICB7Ci0gICAgICAgICAgICAicmV2aXNpb25OdW1iZXIiOiAzMzAxOSwKLSAg ICAgICAgICAgICJsaW5rIjogImh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8zMzAx OSIsCi0gICAgICAgICAgICAidGl0bGUiOiB7IGlubmVySFRNTDogImNvbW1pdCBtZXNzYWdlIiB9 LAotICAgICAgICAgICAgImF1dGhvciI6ICJwYXVsQHdlYmtpdC5vcmciLAotICAgICAgICAgICAg ImRhdGUiOiBuZXcgRGF0ZSgiMjAxNS0xMS0xNlQwMToxODoyMy4wMDBaIiksCi0gICAgICAgICAg ICAiZGVzY3JpcHRpb24iOiAiZGVzY3JpcHRpb24iLAotICAgICAgICAgICAgImNvbnRhaW5zQnJh bmNoTG9jYXRpb24iOiB0cnVlLAotICAgICAgICAgICAgImJyYW5jaE5hbWUiOiAic29tZU90aGVy QnJhbmNoIgotICAgICAgICB9LAotICAgICAgICB7Ci0gICAgICAgICAgICAicmV2aXNpb25OdW1i ZXIiOiAzMzAyMCwKLSAgICAgICAgICAgICJsaW5rIjogImh0dHBzOi8vdHJhYy53ZWJraXQub3Jn L2NoYW5nZXNldC8zMzAyMCIsCi0gICAgICAgICAgICAidGl0bGUiOiB7IGlubmVySFRNTDogImNv bW1pdCBtZXNzYWdlIiB9LAotICAgICAgICAgICAgImF1dGhvciI6ICJnZW9yZ2VAd2Via2l0Lm9y ZyIsCi0gICAgICAgICAgICAiZGF0ZSI6IG5ldyBEYXRlKCIyMDE1LTExLTE2VDAxOjE5OjI3LjAw MFoiKSwKLSAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJkZXNjcmlwdGlvbiIsCi0gICAgICAg ICAgICAiY29udGFpbnNCcmFuY2hMb2NhdGlvbiI6IHRydWUsCi0gICAgICAgICAgICAiYnJhbmNo TmFtZSI6ICJ0cnVuayIKLSAgICAgICAgfSwKLSAgICAgICAgewotICAgICAgICAgICAgInJldmlz aW9uTnVtYmVyIjogMzMwMjEsCi0gICAgICAgICAgICAibGluayI6ICJodHRwczovL3RyYWMud2Vi a2l0Lm9yZy9jaGFuZ2VzZXQvMzMwMjEiLAotICAgICAgICAgICAgInRpdGxlIjogeyBpbm5lckhU TUw6ICJjb21taXQgbWVzc2FnZSIgfSwKLSAgICAgICAgICAgICJhdXRob3IiOiAicmluZ29Ad2Vi a2l0Lm9yZyIsCi0gICAgICAgICAgICAiZGF0ZSI6IG5ldyBEYXRlKCIyMDE1LTExLTE2VDAxOjIw OjU4LjAwMFoiKSwKLSAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJkZXNjcmlwdGlvbiIsCi0g ICAgICAgICAgICAiY29udGFpbnNCcmFuY2hMb2NhdGlvbiI6IHRydWUsCi0gICAgICAgICAgICAi YnJhbmNoTmFtZSI6ICJzb21lT3RoZXJCcmFuY2giCi0gICAgICAgIH0sCi0gICAgICAgIHsKLSAg ICAgICAgICAgICJyZXZpc2lvbk51bWJlciI6IDMzMDIyLAotICAgICAgICAgICAgImxpbmsiOiAi aHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzMzMDIyIiwKLSAgICAgICAgICAgICJ0 aXRsZSI6IHsgaW5uZXJIVE1MOiAiY29tbWl0IG1lc3NhZ2UiIH0sCi0gICAgICAgICAgICAiYXV0 aG9yIjogImJvYkB3ZWJraXQub3JnIiwKLSAgICAgICAgICAgICJkYXRlIjogbmV3IERhdGUoIjIw MTUtMTEtMTZUMDE6MjI6MDEuMDAwWiIpLAotICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogImRl c2NyaXB0aW9uIiwKLSAgICAgICAgICAgICJjb250YWluc0JyYW5jaExvY2F0aW9uIjogdHJ1ZSwK LSAgICAgICAgICAgICJicmFuY2hOYW1lIjogInRydW5rIgotICAgICAgICB9Ci0gICAgXTsKIH07 CiAKIEJhc2VPYmplY3QuYWRkQ29uc3RydWN0b3JGdW5jdGlvbnMoTW9ja1RyYWMpOwpAQCAtMTAw LDMgKzQ4LDU2IEBAIE1vY2tUcmFjLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgfSwKIH07CisK K01vY2tUcmFjLkVYQU1QTEVfVFJBQ19DT01NSVRTID0gWworICAgIHsKKyAgICAgICAgInJldmlz aW9uTnVtYmVyIjogMzMwMTgsCisgICAgICAgICJsaW5rIjogImh0dHBzOi8vdHJhYy53ZWJraXQu b3JnL2NoYW5nZXNldC8zMzAxOCIsCisgICAgICAgICJ0aXRsZSI6IHsgaW5uZXJIVE1MOiAiY29t bWl0IG1lc3NhZ2UiIH0sCisgICAgICAgICJhdXRob3IiOiAiam9obkB3ZWJraXQub3JnIiwKKyAg ICAgICAgImRhdGUiOiBuZXcgRGF0ZSgiMjAxNS0xMS0xNVQxNzowNTo0NC4wMDBaIiksCisgICAg ICAgICJkZXNjcmlwdGlvbiI6ICJkZXNjcmlwdGlvbiIsCisgICAgICAgICJjb250YWluc0JyYW5j aExvY2F0aW9uIjogdHJ1ZSwKKyAgICAgICAgImJyYW5jaGVzIjogWyJ0cnVuayJdCisgICAgfSwK KyAgICB7CisgICAgICAgICJyZXZpc2lvbk51bWJlciI6IDMzMDE5LAorICAgICAgICAibGluayI6 ICJodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMzMwMTkiLAorICAgICAgICAidGl0 bGUiOiB7IGlubmVySFRNTDogImNvbW1pdCBtZXNzYWdlIiB9LAorICAgICAgICAiYXV0aG9yIjog InBhdWxAd2Via2l0Lm9yZyIsCisgICAgICAgICJkYXRlIjogbmV3IERhdGUoIjIwMTUtMTEtMTZU MDE6MTg6MjMuMDAwWiIpLAorICAgICAgICAiZGVzY3JpcHRpb24iOiAiZGVzY3JpcHRpb24iLAor ICAgICAgICAiY29udGFpbnNCcmFuY2hMb2NhdGlvbiI6IHRydWUsCisgICAgICAgICJicmFuY2hl cyI6IFsic29tZU90aGVyQnJhbmNoIl0KKyAgICB9LAorICAgIHsKKyAgICAgICAgInJldmlzaW9u TnVtYmVyIjogMzMwMjAsCisgICAgICAgICJsaW5rIjogImh0dHBzOi8vdHJhYy53ZWJraXQub3Jn L2NoYW5nZXNldC8zMzAyMCIsCisgICAgICAgICJ0aXRsZSI6IHsgaW5uZXJIVE1MOiAiY29tbWl0 IG1lc3NhZ2UiIH0sCisgICAgICAgICJhdXRob3IiOiAiZ2VvcmdlQHdlYmtpdC5vcmciLAorICAg ICAgICAiZGF0ZSI6IG5ldyBEYXRlKCIyMDE1LTExLTE2VDAxOjE5OjI3LjAwMFoiKSwKKyAgICAg ICAgImRlc2NyaXB0aW9uIjogImRlc2NyaXB0aW9uIiwKKyAgICAgICAgImNvbnRhaW5zQnJhbmNo TG9jYXRpb24iOiB0cnVlLAorICAgICAgICAiYnJhbmNoZXMiOiBbInRydW5rIl0KKyAgICB9LAor ICAgIHsKKyAgICAgICAgInJldmlzaW9uTnVtYmVyIjogMzMwMjEsCisgICAgICAgICJsaW5rIjog Imh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8zMzAyMSIsCisgICAgICAgICJ0aXRs ZSI6IHsgaW5uZXJIVE1MOiAiY29tbWl0IG1lc3NhZ2UiIH0sCisgICAgICAgICJhdXRob3IiOiAi cmluZ29Ad2Via2l0Lm9yZyIsCisgICAgICAgICJkYXRlIjogbmV3IERhdGUoIjIwMTUtMTEtMTZU MDE6MjA6NTguMDAwWiIpLAorICAgICAgICAiZGVzY3JpcHRpb24iOiAiZGVzY3JpcHRpb24iLAor ICAgICAgICAiY29udGFpbnNCcmFuY2hMb2NhdGlvbiI6IHRydWUsCisgICAgICAgICJicmFuY2hl cyI6IFsic29tZU90aGVyQnJhbmNoIl0KKyAgICB9LAorICAgIHsKKyAgICAgICAgInJldmlzaW9u TnVtYmVyIjogMzMwMjIsCisgICAgICAgICJsaW5rIjogImh0dHBzOi8vdHJhYy53ZWJraXQub3Jn L2NoYW5nZXNldC8zMzAyMiIsCisgICAgICAgICJ0aXRsZSI6IHsgaW5uZXJIVE1MOiAiY29tbWl0 IG1lc3NhZ2UiIH0sCisgICAgICAgICJhdXRob3IiOiAiYm9iQHdlYmtpdC5vcmciLAorICAgICAg ICAiZGF0ZSI6IG5ldyBEYXRlKCIyMDE1LTExLTE2VDAxOjIyOjAxLjAwMFoiKSwKKyAgICAgICAg ImRlc2NyaXB0aW9uIjogImRlc2NyaXB0aW9uIiwKKyAgICAgICAgImNvbnRhaW5zQnJhbmNoTG9j YXRpb24iOiB0cnVlLAorICAgICAgICAiYnJhbmNoZXMiOiBbInRydW5rIl0KKyAgICB9CitdOwpc IE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3Jp cHRzL3Rlc3RzL3Rlc3QtZml4dHVyZS1naXQtdHJhYy1yc3MueG1sIGIvVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Nj cmlwdHMvdGVzdHMvdGVzdC1maXh0dXJlLWdpdC10cmFjLXJzcy54bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNzhj MjQ0YzQzZWE3ODhlMzY5MWMwMzllMmU4MzQwNTA3ZDVjYjdlZAotLS0gL2Rldi9udWxsCisrKyBi L1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19o dG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL3Rlc3QtZml4dHVyZS1naXQtdHJhYy1yc3MueG1s CkBAIC0wLDAgKzEsNzUgQEAKKzw/eG1sIHZlcnNpb249IjEuMCI/PgorPCEtLQorQ29weXJpZ2h0 IChDKSAyMDE2IEFwcGxlLCBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisKK1JlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAor bW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBj b25kaXRpb25zCithcmUgbWV0OgorMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11 c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKzIuIFJlZGlzdHJpYnV0aW9u cyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgICBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIgaW4gdGhlCisgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlk ZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorCitUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZ IEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCitBTkQgQU5ZIEVYUFJF U1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywK K1RIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UiBBIFBBUlRJQ1VMQVIKK1BVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxM IEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworQkUgTElBQkxFIEZPUiBBTlkgRElSRUNU LCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorQ09OU0VRVUVO VElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQg T0YKK1NVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQ Uk9GSVRTOyBPUiBCVVNJTkVTUworSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04g QU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KK0NPTlRSQUNULCBTVFJJQ1QgTElB QklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCitBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GCitUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCistLT4KKworPHJzcyB4 bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHZlcnNpb249IjIuMCI+ CisgIDxjaGFubmVsPgorICAgIDx0aXRsZT5XZWJLaXQ8L3RpdGxlPgorICAgIDxsaW5rPmh0dHBz Oi8vdHJhYy53ZWJraXQub3JnL3RpbWVsaW5lPC9saW5rPgorICAgIDxkZXNjcmlwdGlvbj5UcmFj IFRpbWVsaW5lPC9kZXNjcmlwdGlvbj4KKyAgICA8bGFuZ3VhZ2U+ZW4tVVM8L2xhbmd1YWdlPgor ICAgIDxnZW5lcmF0b3I+VHJhYyAwLjEyLjM8L2dlbmVyYXRvcj4KKyAgICA8aW1hZ2U+CisgICAg ICA8dGl0bGU+V2ViS2l0PC90aXRsZT4KKyAgICAgIDx1cmw+aHR0cHM6Ly90cmFjLndlYmtpdC5v cmcvY2hyb21lL3NpdGUvZmF2aWNvbi5wbmc8L3VybD4KKyAgICAgIDxsaW5rPmh0dHBzOi8vdHJh Yy53ZWJraXQub3JnL3RpbWVsaW5lPC9saW5rPgorICAgIDwvaW1hZ2U+CisgICAgPGl0ZW0+Cisg ICAgICA8dGl0bGU+Q2hhbmdlc2V0IFszMzAyNV06IEl0YSBwcm9yc3VzIGlucXVhbSBBZCBjb3Jw dXMgZGljZXJlcyBwZXJ0aW5lcmUsIHNlZCBlYSwgcXVhZSBkaXhpPC90aXRsZT4KKyAgICAgIDxi cmFuY2hlcz5tYXN0ZXIsIHNvbWVPdGhlckJyYW5jaDwvYnJhbmNoZXM+CisgICAgICAKKyAgICAg ICAgPGF1dGhvcj5nZW9yZ2VAd2Via2l0Lm9yZzwvYXV0aG9yPgorCisgICAgICA8cHViRGF0ZT5U dWUsIDI2IEphbiAyMDE2IDIyOjQ4OjE1IEdNVDwvcHViRGF0ZT4KKyAgICAgIDxsaW5rPmh0dHBz Oi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8zMzAyNTwvbGluaz4KKyAgICAgIDxndWlkIGlz UGVybWFMaW5rPSJmYWxzZSI+aHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzMzMDI1 LzE0NTM4NDg0OTUzMzI1Njk8L2d1aWQ+CisgICAgICA8ZGVzY3JpcHRpb24+RGVzY3JpcHRpb248 L2Rlc2NyaXB0aW9uPgorICAgICAgPGNhdGVnb3J5PmNoYW5nZXNldDwvY2F0ZWdvcnk+CisgICAg PC9pdGVtPgorICAgIDxpdGVtPgorICAgICAgPHRpdGxlPkNoYW5nZXNldCBbMzMwMjRdOiBBbiBl dW0gZGlzY2VyZSBlYSBtYXZpcywgcXVhZSBjdW0gcGxhbmUgcGVyZGlkaWNlcml0aSBuaWhpbCBz Y2lhdDwvdGl0bGU+CisgICAgICA8YnJhbmNoZXM+bWFzdGVyPC9icmFuY2hlcz4KKworICAgICAg ICA8YXV0aG9yPnBhdWxAd2Via2l0Lm9yZzwvYXV0aG9yPgorCisgICAgICA8cHViRGF0ZT5UdWUs IDI2IEphbiAyMDE2IDIyOjIyOjI1IEdNVDwvcHViRGF0ZT4KKyAgICAgIDxsaW5rPmh0dHBzOi8v dHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8zMzAyNDwvbGluaz4KKyAgICAgIDxndWlkIGlzUGVy bWFMaW5rPSJmYWxzZSI+aHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzMzMDI0LzE0 NTM4NDY5NDUyNDQwMDc8L2d1aWQ+CisgICAgICA8ZGVzY3JpcHRpb24+RGVzY3JpcHRpb248L2Rl c2NyaXB0aW9uPgorICAgICAgPGNhdGVnb3J5PmNoYW5nZXNldDwvY2F0ZWdvcnk+CisgICAgPC9p dGVtPgorICAgIDxpdGVtPgorICAgICAgPHRpdGxlPkNoYW5nZXNldCBbMzMwMjNdOiBMb3JlbSBp cHN1bSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0dXIgYWRpcGlzY2luZyBlbGl0LjwvdGl0bGU+ CisgIAorICAgICAgICA8YXV0aG9yPmpvaG5Ad2Via2l0Lm9yZzwvYXV0aG9yPgorCisgICAgICA8 cHViRGF0ZT5UdWUsIDI2IEphbiAyMDE2IDIyOjIyOjE0IEdNVDwvcHViRGF0ZT4KKyAgICAgIDxs aW5rPmh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8zMzAyMzwvbGluaz4KKyAgICAg IDxndWlkIGlzUGVybWFMaW5rPSJmYWxzZSI+aHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdl c2V0LzMzMDIzLzE0NTM4NDY5MzQwMzQ1NTA8L2d1aWQ+CisgICAgICA8ZGVzY3JpcHRpb24+RGVz Y3JpcHRpb248L2Rlc2NyaXB0aW9uPgorICAgICAgPGNhdGVnb3J5PmNoYW5nZXNldDwvY2F0ZWdv cnk+CisgICAgPC9pdGVtPgorICAgPC9jaGFubmVsPgorPC9yc3M+ClwgTm8gbmV3bGluZSBhdCBl bmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Vi a2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdHMu anMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJs aWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy90ZXN0cy5qcwppbmRleCA1NTAyMGI1N2Mz ODAwYzY2YTEyYTViMTFkYzYwZTM5OGI1ZDYwZTllLi40ZTNlZWVlMDFhYzEzMGUzN2JkODAyMTU4 NDM2OWQ1MmY0ZmZkMDEwIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWls ZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy90 ZXN0cy5qcworKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy90ZXN0cy5qcwpAQCAtMzEs MTEgKzMxLDExIEBAIG1vZHVsZSgiVHJhYyIsIHsKIAogdGVzdCgiX2xvYWRlZCIsIGZ1bmN0aW9u KCkKIHsKKyAgICB0aGlzLnRyYWMucmVjb3JkZWRDb21taXRzID0gTW9ja1RyYWMuRVhBTVBMRV9U UkFDX0NPTU1JVFM7CiAgICAgdmFyIGNsaWVudCA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOwogICAg IGNsaWVudC5vcGVuKCdHRVQnLCAndGVzdC1maXh0dXJlLXRyYWMtcnNzLnhtbCcsIGZhbHNlKTsK LSAgICBjbGllbnQub25yZWFkeXN0YXRlY2hhbmdlID0gZnVuY3Rpb24gKCkgewotICAgICAgICBp ZiAoY2xpZW50LnJlYWR5U3RhdGUgPT09IGNsaWVudC5ET05FKQotICAgICAgICAgICAgdGhpcy50 cmFjLl9sb2FkZWQoY2xpZW50LnJlc3BvbnNlWE1MKTsKKyAgICBjbGllbnQub25sb2FkID0gZnVu Y3Rpb24gKCkgeworICAgICAgICB0aGlzLnRyYWMuX2xvYWRlZChjbGllbnQucmVzcG9uc2VYTUwp OwogICAgIH0uYmluZCh0aGlzKTsKICAgICBjbGllbnQuc2VuZCgpOwogICAgIHZhciBjb21taXRz ID0gdGhpcy50cmFjLnJlY29yZGVkQ29tbWl0czsKQEAgLTQ3LDYgKzQ3LDI0IEBAIHRlc3QoIl9s b2FkZWQiLCBmdW5jdGlvbigpCiAgICAgfQogfSk7CiAKK3Rlc3QoInBhcnNlIGdpdEJyYW5jaGVz IiwgZnVuY3Rpb24oKQoreworICAgIHZhciBjbGllbnQgPSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsK KyAgICBjbGllbnQub3BlbigiR0VUIiwgInRlc3QtZml4dHVyZS1naXQtdHJhYy1yc3MueG1sIiwg ZmFsc2UpOworICAgIGNsaWVudC5vbmxvYWQgPSBmdW5jdGlvbiAoKSB7CisgICAgICAgIHRoaXMu dHJhYy5fbG9hZGVkKGNsaWVudC5yZXNwb25zZVhNTCk7CisgICAgfS5iaW5kKHRoaXMpOworICAg IGNsaWVudC5zZW5kKCk7CisgICAgdmFyIGNvbW1pdHMgPSB0aGlzLnRyYWMucmVjb3JkZWRDb21t aXRzOworICAgIHN0cmljdEVxdWFsKGNvbW1pdHMubGVuZ3RoLCAzLCAic2hvdWxkIGhhdmUgMiBj b21taXRzIik7CisgICAgc3RyaWN0RXF1YWwoY29tbWl0c1swXS5icmFuY2hlcy5sZW5ndGgsIDAs ICJzaG91bGQgaGF2ZSBubyBicmFuY2hlcyIpOworICAgIHN0cmljdEVxdWFsKGNvbW1pdHNbMV0u YnJhbmNoZXMubGVuZ3RoLCAxLCAic2hvdWxkIGhhdmUgb25lIGJyYW5jaCIpOworICAgIHN0cmlj dEVxdWFsKGNvbW1pdHNbMV0uYnJhbmNoZXMuaW5jbHVkZXMoIm1hc3RlciIpLCB0cnVlLCAic2hv dWxkIGNvbnRhaW4gYnJhbmNoIG1hc3RlciIpOworICAgIHN0cmljdEVxdWFsKGNvbW1pdHNbMl0u YnJhbmNoZXMubGVuZ3RoLCAyLCAic2hvdWxkIGhhdmUgdHdvIGJyYW5jaGVzIik7CisgICAgc3Ry aWN0RXF1YWwoY29tbWl0c1syXS5icmFuY2hlcy5pbmNsdWRlcygibWFzdGVyIiksIHRydWUsICJz aG91bGQgY29udGFpbiBicmFuY2ggbWFzdGVyIik7CisgICAgc3RyaWN0RXF1YWwoY29tbWl0c1sy XS5icmFuY2hlcy5pbmNsdWRlcygic29tZU90aGVyQnJhbmNoIiksIHRydWUsICJzaG91bGQgY29u dGFpbiBicmFuY2ggc29tZU90aGVyQnJhbmNoIik7Cit9KTsKKwogdGVzdCgiX3BhcnNlUmV2aXNp b25Gcm9tVVJMIiwgZnVuY3Rpb24oKQogewogICAgIHN0cmljdEVxdWFsKHRoaXMudHJhYy5fcGFy c2VSZXZpc2lvbkZyb21VUkwoImh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8xOTA0 OTciKSwgIjE5MDQ5NyIsICJTdWJ2ZXJzaW9uIik7CkBAIC01Nyw2ICs3NSw3IEBAIHRlc3QoIl9w YXJzZVJldmlzaW9uRnJvbVVSTCIsIGZ1bmN0aW9uKCkKIG1vZHVsZSgiQnVpbGRCb3RRdWV1ZVZp ZXciLCB7CiAgICAgc2V0dXA6IGZ1bmN0aW9uKCkgewogICAgICAgICB0aGlzLnRyYWMgPSBuZXcg TW9ja1RyYWMoKTsKKyAgICAgICAgdGhpcy50cmFjLnJlY29yZGVkQ29tbWl0cyA9IE1vY2tUcmFj LkVYQU1QTEVfVFJBQ19DT01NSVRTOwogICAgICAgICB0aGlzLnF1ZXVlID0gbmV3IE1vY2tCdWls ZGJvdFF1ZXVlKCk7CiAgICAgICAgIHRoaXMudHJ1bmtCcmFuY2ggPSB7CiAgICAgICAgICAgICBu YW1lOiAidHJ1bmsiLAo=