145570 2015-06-02 14:59:08 -0700 Green ✓ color on build-safari.apple.com too bright. Added color selection. 2015-06-05 13:44:31 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Minor --- 1 mdaiter mdaiter ap commit-queue jonlee mdaiter webkit-bug-importer oldest_to_newest 1098914 0 mdaiter 2015-06-02 14:59:08 -0700 New green color is too bright for some people. Needed to make a toggle switch to change coloring of the checkmarks/status indicators. 1098915 1 mdaiter 2015-06-02 15:00:14 -0700 <rdar://problem/20994468> 1098936 2 254112 mdaiter 2015-06-02 15:26:22 -0700 Created attachment 254112 Patch 1098955 3 254112 ap 2015-06-02 15:57:00 -0700 Comment on attachment 254112 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254112&action=review > Tools/ChangeLog:3 > + Changed the greens/reds so that there would be less eye-strain Could you please attach a screenshot for how the preferences look? > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html:37 > + <script src="Scripts/Deuteranopia.js"></script> We already have Settings.js, I don't see a need for a new file implementing another bit of settings. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Deuteranopia.js:1 > +//Meant to be used for the Deu attributes button WebKit style is to have a space after "//", a full sentence, and then a period. Also, we almost never abbreviate any words. I don't think that spelling out deuteranopia is needed, I'd call it "accessible colors" throughout the code and in UI. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Deuteranopia.js:3 > +function changePreferencesForColor(){ > + var deu = getDeuCookie("deu"); WebKit style is to have the brace on a new line, and 4 space indents. Please take a look at <http://www.webkit.org/coding/coding-style.html>. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Deuteranopia.js:6 > + setDeuCookie("deu", "false"); If you were adding code to Settings.js instead of a new file, it would be easier to see that we use a different technique for storing settings. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Deuteranopia.js:10 > + else{ > + setDeuCookie("deu", "true"); > + } No braces around single line blocks. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Deuteranopia.js:15 > + //Loading cookies We very rarely add comments explaining what the code does. We use comments to explain why it does certain non-obvious things. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Deuteranopia.js:16 > + var checkmark_deu = getDeuCookie("deu"); Names should be camelCase. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Deuteranopia.js:26 > + link.href = 'Styles/StatusLineViewBubbleDEU.css'; Switching stylesheets is unnecessarily complicated, you can just use document.body.classList.toggle("accessibleColors"), as we do for showing settings, and make bubble colors depend on that class. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Settings.js:85 > + This is a spurious edit, please revert it. 1099003 4 254132 mdaiter 2015-06-02 18:26:23 -0700 Created attachment 254132 Patch 1099005 5 commit-queue 2015-06-02 18:28:23 -0700 Attachment 254132 did not pass style-queue: ERROR: Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:294: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1099062 6 254132 ap 2015-06-02 22:15:06 -0700 Comment on attachment 254132 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254132&action=review Thank you, this approach looks much better. > Tools/ChangeLog:7 > + Mainly shifting CSS around, doing off-loading of CSS files from browser to change colors. Used cookies to store colors. Colors necessary for accessibility. Main goal for this iteration was to cut down on code Please update the ChangeLog, it is out of date now. We usually wrap ChangeLogs to some reasonable width, please match entries below. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html:34 > - > + Please revert this spurious change. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:139 > +function loadAccessibilityColors(){ WebKit style is to put the brace on a new line. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:142 > + if (!isCurrentlyActivated) > + isCurrentlyActivated = false; What is the purpose of this assignment? > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:144 > + toggleAccessibleColors(); This function doesn't exist. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:145 > +} I would write this function like this: I would write it like this: function applyAccessibleColorSetting() { var useAccessibleColors = settings.getObject("useAccessibleColors"); if (useAccessibleColors) toggleAccessibleColors(); } > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:156 > + if (isCurrentlyActivated == true) > + settings.setObject("accessibilityOptions", false); > + else > + settings.setObject("accessibilityOptions", true); There is no need to use an if statement to flip a boolean, you could simply write: settings.setObject("useAccessibleColors", !isCurrentlyActivated); > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:168 > + var toggle = document.createElement("div"); Please create the variable just before it's used, and use a more descriptive name. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:178 > + > unhideButton.addEventListener("click", function () { settings.clearHiddenPlatforms(); }); > unhideButton.textContent = "Show All Platforms"; > unhideButton.classList.add("cellButton", "unhide", "hidden"); > + > header.appendChild(unhideButton); > row.appendChild(header); > > + Please revert these spurious changes. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:291 > + toggle.setAttribute("class", "cellButton unhide hidden"); This element ends up being positioned strangely, under the last column heading ("Other"). As it's not only about this header, it should be elsewhere, in a location that clearly indicated that it's a global setting that applies to all bubbles. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:294 > + settings.addSettingListener("toggleAccessibility", updateAccessibilityColors); A tab character here. I think that changing settings, dispatching a notification and listening for it is a little too roundabout, we don't expect to have any other listeners. This change can be applied directly from click event handler. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:300 > + toggleAccessibleColors(); This function doesn't seem to exist. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Settings.js:106 > + document.body.classList.toggle("accessible-colors"); This should be in Main.js, not in Settings.js. The Settings object is responsible for storing the settings, and is partially responsible for displaying them, but should not be responsible for implementing their effects. 1099199 7 254190 mdaiter 2015-06-03 11:28:20 -0700 Created attachment 254190 Patch 1099270 8 254190 ap 2015-06-03 14:13:22 -0700 Comment on attachment 254190 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254190&action=review Almost good to go! > Tools/ChangeLog:10 > + Mainly shifting CSS around, doing off-loading of CSS files from > + browser to change colors. Used cookies to store colors. Colors > + necessary for accessibility. Main goal for this iteration was to > + cut down on code. Cut down on notifications, other code bogging down system The ChangeLog comment should describe the patch overall, not just the changes form the previous iteration. This is what will be landed to svn, and remain in eternity. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:142 > + if (useAccessibleColors){ Please remove braces around the single line statement (and if there were multiple lines, we'd need a space before the opening brace). > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:147 > +function updateAccessibilityColors() Maybe toggleAccessibleColors()? We should also standardize on one form, either "accessible colors" or "accessibility colors". > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:150 > + if (isCurrentlyActivated == undefined) We use "===" in JS code to make the behavior more predictable. I don't think that it matters in this case, but it would be good to do the same for consistency. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:284 > + toggleAccessibilityColorButton.setAttribute("class", "cellButton unhide hidden accessibilityButton"); I don't think that cellButton is right any more, as the button is not in a cell. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:285 > + toggleAccessibilityColorButton.textContent = "enable accessibility colors"; As discussed in person, this should change to "disable accessibility(accessible?) colors" when the setting is already enabled. 1099297 9 254212 mdaiter 2015-06-03 15:10:20 -0700 Created attachment 254212 Patch 1099326 10 254212 ap 2015-06-03 17:08:25 -0700 Comment on attachment 254212 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254212&action=review All my comments are nitpicks at this point, so r+. Since you don't have committer access yet, you can upload a new patch with "Reviewed by Alexey Proskuryakov." in the ChangeLog, and only mark it cq?, not r?. Or you can just upload normally if you'd like to get one final review round. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:139 > +function applyAccessibleColorSetting() Still some inconsistent wording: accessible instead of accessibility as used in most places. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:142 > + var toggleAccessibilityColorButton = document.querySelectorAll("div.unhide.hidden.accessibilityButton")[0]; Please just add an id for the button. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:147 > + } > + else Else should go on the same line with the brace: } else > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:159 > + var toggleAccessibilityColorButton = document.querySelectorAll("div.unhide.hidden.accessibilityButton")[0]; Please use the id here too. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:179 > - var header = document.createElement("th"); > var unhideButton = document.createElement("div"); > unhideButton.addEventListener("click", function () { settings.clearHiddenPlatforms(); }); > unhideButton.textContent = "Show All Platforms"; > unhideButton.classList.add("cellButton", "unhide", "hidden"); > + > + var header = document.createElement("th"); Please undo this change. The code was easier to read when elements inside the header were created after the line that created the header element. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css:208 > + top: 13.5px; Did you check how this looks on a non-Retina screen? I don't know what to expect, but sometimes subpixel positioning ends up causing trouble when there are no subpixels 1099354 11 254229 mdaiter 2015-06-03 18:28:09 -0700 Created attachment 254229 Patch 1099407 12 254229 ap 2015-06-03 22:56:40 -0700 Comment on attachment 254229 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254229&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:173 > - var header = document.createElement("th"); > + var header = document.createElement("th"); Still a spurious edit here. It is always a good idea to check a patch right before uploading it, essentially as your own review pass. 1099436 13 254229 commit-queue 2015-06-03 23:46:13 -0700 Comment on attachment 254229 Patch Clearing flags on attachment: 254229 Committed r185193: <http://trac.webkit.org/changeset/185193> 1099437 14 commit-queue 2015-06-03 23:46:17 -0700 All reviewed patches have been landed. Closing bug. 1099694 15 mdaiter 2015-06-04 17:49:43 -0700 Reopening to attach new patch. 1099695 16 254322 mdaiter 2015-06-04 17:49:45 -0700 Created attachment 254322 Patch 1099702 17 254322 ap 2015-06-04 18:09:54 -0700 Comment on attachment 254322 Patch I can see why this can be seen as desirable, but we'd get overlapped elements on smaller screens with this. Also, the correct marking would have been r?, not r+. 1099920 18 mdaiter 2015-06-05 13:30:40 -0700 Alright, makes sense. Will leave as is (with absolute positioning) 254112 2015-06-02 15:26:22 -0700 2015-06-02 18:26:20 -0700 Patch bug-145570-20150602152606.patch text/plain 13455 mdaiter SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4NTEyOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDQ4IEBACisyMDE1LTA2LTAyICBNYXR0aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29t PgorCisgICAgICAgIENoYW5nZWQgdGhlIGdyZWVucy9yZWRzIHNvIHRoYXQgdGhlcmUgd291bGQg YmUgbGVzcyBleWUtc3RyYWluCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDU1NzAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIwOTk0NDY4PgorCisg ICAgICAgIE1haW5seSBzaGlmdGluZyBDU1MgYXJvdW5kLCBkb2luZyBvZmYtbG9hZGluZyBvZiBD U1MgZmlsZXMgZnJvbSBicm93c2VyIHRvIGNoYW5nZSBjb2xvcnMuIFVzZWQgY29va2llcyB0byBz dG9yZSBjb2xvcnMuIENvbG9ycyBuZWNlc3NhcnkgZm9yIGFjY2Vzc2liaWxpdHkuCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0 cy9EZXV0ZXJhbm9waWEuanM6IEFkZGVkLgorICAgICAgICAoY2hhbmdlUHJlZmVyZW5jZXNGb3JD b2xvcik6IE1lYW50IHRvIGNoYW5nZSBjb29raWVzIGZvciBwcmVmZXJlbmNlcworICAgICAgICAo bG9hZENvbG9yQWNjZXNzaWJsZUJ1dHRvbnMpOiBMb2FkaW5nIGNvbG9yIG9wdGlvbnMgZnJvbSBj b29raWUKKyAgICAgICAgKHRyeVRvTG9hZFBhcmFtc0Zyb21Db29raWUpOiBGYWxsYmFjayBmdW5j dGlvbiBpZi0tZm9yIHNvbWUgcmVhc29uLS1sYW9kQ29sb3JBY2Nlc3NpYmxlQnV0dG9ucyBkb2Vz bid0IHdvcmsKKyAgICAgICAgKHNldERldUNvb2tpZSk6IFNldHRpbmcgdGhlIGNvb2tpZQorICAg ICAgICAoZ2V0RGV1Q29va2llKTogR2V0dGluZyB0aGUgY29va2llCisgICAgICAgICogQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvTWFpbi5qczoKKyAgICAgICAgKGRvY3VtZW50UmVhZHkpOiBKdXN0IGNoYW5nZWQg dGhpcyB0byBpbmNsdWRlIGxvYWRpbmcgb2YgY29sb3JzCisgICAgICAgICogQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvU2V0dGluZ3MuanM6CisgICAgICAgIChTZXR0aW5ncy5wcm90b3R5cGUudG9nZ2xlU2V0dGlu Z3NEaXNwbGF5KTogQWRkZWQgaW4gYnV0dG9uIHRvIGxldCB1c2VycyBjaGFuZ2UgY29sb3IKKyAg ICAgICAgKFNldHRpbmdzLnByb3RvdHlwZS50b2dnbGVIaWRkZW5QbGF0Zm9ybSk6CisgICAgICAg ICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwv ZGFzaGJvYXJkL1N0eWxlcy9TdGF0dXNMaW5lVmlldy5jc3M6IEluIGdlbmVyYWw6IHNoaWZ0ZWQg YXJvdW5kIGJ1YmJsZSBzdHlsaW5nCisgICAgICAgICguc3RhdHVzLWxpbmUubmV1dHJhbCAuYnVi YmxlKToKKyAgICAgICAgKC5zdGF0dXMtbGluZS51bmF1dGhvcml6ZWQgLmJ1YmJsZSk6CisgICAg ICAgICguc3RhdHVzLWxpbmUuZGFuZ2VyIC5idWJibGUucGljdG9ncmFtKToKKyAgICAgICAgKC5z dGF0dXMtbGluZS5iYWQgLmJ1YmJsZS5waWN0b2dyYW0pOgorICAgICAgICAoLnN0YXR1cy1saW5l Lm5vLWJ1YmJsZSAubWVzc2FnZSk6CisgICAgICAgICguc3RhdHVzLWxpbmUuZGFuZ2VyIC5tZXNz YWdlKToKKyAgICAgICAgKC5zdGF0dXMtbGluZS51bmF1dGhvcml6ZWQgLm1lc3NhZ2UpOgorICAg ICAgICAoLnN0YXR1cy1saW5lLmdvb2QgLmJ1YmJsZSk6IERlbGV0ZWQuCisgICAgICAgICguc3Rh dHVzLWxpbmUuYmFkIC5idWJibGUpOiBEZWxldGVkLgorICAgICAgICAoLnN0YXR1cy1saW5lLmdv b2QgLm1lc3NhZ2UpOiBEZWxldGVkLgorICAgICAgICAoLnN0YXR1cy1saW5lLmJhZCAubWVzc2Fn ZSk6IERlbGV0ZWQuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1N0eWxlcy9TdGF0dXNMaW5lVmlld0J1YmJs ZURFVS5jc3M6IEFkZGVkLgorICAgICAgICAoLnN0YXR1cy1saW5lLmdvb2QgLmJ1YmJsZSk6Cisg ICAgICAgICguc3RhdHVzLWxpbmUuYmFkIC5idWJibGUpOgorICAgICAgICAoLnN0YXR1cy1saW5l Lmdvb2QgLm1lc3NhZ2UpOgorICAgICAgICAoLnN0YXR1cy1saW5lLmJhZCAubWVzc2FnZSk6Cisg ICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1N0eWxlcy9TdGF0dXNMaW5lVmlld0J1YmJsZVJlZy5jc3M6IEFkZGVk LgorICAgICAgICAoLnN0YXR1cy1saW5lLmJhZCAuYnViYmxlKToKKyAgICAgICAgKC5zdGF0dXMt bGluZS5nb29kIC5idWJibGUpOgorICAgICAgICAoLnN0YXR1cy1saW5lLmdvb2QgLm1lc3NhZ2Up OgorICAgICAgICAoLnN0YXR1cy1saW5lLmJhZCAubWVzc2FnZSk6CisgICAgICAgICogQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L2luZGV4Lmh0bWw6CisKIDIwMTUtMDYtMDIgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29t PgogCiAgICAgICAgIGJ1aWxkLWpzYydzIC0tY2xvb3Agb3B0aW9uIGlzIGJyb2tlbi4KSW5kZXg6 IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19o dG1sL2Rhc2hib2FyZC9pbmRleC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9pbmRl eC5odG1sCShyZXZpc2lvbiAxODUxMjkpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWls ZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvaW5kZXguaHRtbAkod29y a2luZyBjb3B5KQpAQCAtMzEsNyArMzEsMTAgQEAgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLgogICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iU3R5bGVzL1BvcG92ZXIuY3Nz Ij48L2xpbms+CiAgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJTdHlsZXMvUXVldWVW aWV3LmNzcyI+PC9saW5rPgogICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iU3R5bGVz L1N0YXR1c0xpbmVWaWV3LmNzcyI+PC9saW5rPgotCisgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0 IiBpZD0iZGV1X29uIiBocmVmPSJTdHlsZXMvU3RhdHVzTGluZVZpZXdCdWJibGVERVUuY3NzIj48 L2xpbms+CisgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBpZD0iZGV1X29mZiIgaHJlZj0iU3R5 bGVzL1N0YXR1c0xpbmVWaWV3QnViYmxlUmVnLmNzcyI+PC9saW5rPgorICAgIAorICAgIDxzY3Jp cHQgc3JjPSJTY3JpcHRzL0RldXRlcmFub3BpYS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBz cmM9IlNjcmlwdHMvVXRpbGl0aWVzLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iU2Ny aXB0cy9CYXNlT2JqZWN0LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iU2NyaXB0cy9E YXNoYm9hcmQuanMiPjwvc2NyaXB0PgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvRGV1dGVy YW5vcGlhLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0RldXRlcmFub3Bp YS5qcwkocmV2aXNpb24gMCkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0RldXRlcmFub3BpYS5q cwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDExNiBAQAorLy9NZWFudCB0byBiZSB1c2VkIGZv ciB0aGUgRGV1IGF0dHJpYnV0ZXMgYnV0dG9uCitmdW5jdGlvbiBjaGFuZ2VQcmVmZXJlbmNlc0Zv ckNvbG9yKCl7CisgIHZhciBkZXUgPSBnZXREZXVDb29raWUoImRldSIpOworICAvL0Nvb2tpZSBh dHRyaWJ1dGVzIGFsd2F5cyByZXR1cm5lZCBpbiBzdHJpbmcgZm9ybQorICBpZiAoZGV1ID09ICJ0 cnVlIil7CisgICAgc2V0RGV1Q29va2llKCJkZXUiLCAiZmFsc2UiKTsKKyAgfQorICBlbHNlewor ICAgIHNldERldUNvb2tpZSgiZGV1IiwgInRydWUiKTsKKyAgfQorICBsb2FkQ29sb3JBY2Nlc3Np YmxlQnV0dG9ucygpOworfQorCitmdW5jdGlvbiBsb2FkQ29sb3JBY2Nlc3NpYmxlQnV0dG9ucygp eworICAvL0xvYWRpbmcgY29va2llcworICB2YXIgY2hlY2ttYXJrX2RldSA9IGdldERldUNvb2tp ZSgiZGV1Iik7CisgIAorICAvL01haW4gcGFydCBvZiBkZWNpZGluZyB3aGljaCBDU1MgdG8gbG9h ZAorICB2YXIgaGVhZCAgPSBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgnaGVhZCcpWzBd OworICB2YXIgbGluayAgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdsaW5rJyk7CisgIAorICBs aW5rLnJlbCAgPSAnc3R5bGVzaGVldCc7CisgIGxpbmsudHlwZSA9ICd0ZXh0L2Nzcyc7CisgIGlm IChjaGVja21hcmtfZGV1ID09ICJ0cnVlIil7CisgICAgbGluay5pZCA9ICJkZXVfb24iOworICAg IGxpbmsuaHJlZiA9ICdTdHlsZXMvU3RhdHVzTGluZVZpZXdCdWJibGVERVUuY3NzJzsKKyAgICBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZGV1X29mZicpLmRpc2FibGVkID0gdHJ1ZTsKKyAgfQor ICBlbHNleworICAgIGxpbmsuaWQgPSAiZGV1X29mZiI7CisgICAgbGluay5ocmVmID0gJ1N0eWxl cy9TdGF0dXNMaW5lVmlld0J1YmJsZVJlZy5jc3MnOworICAgIGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCdkZXVfb24nKS5kaXNhYmxlZCA9IHRydWU7CisgIH0KKyAgbGluay5tZWRpYSA9ICdhbGwn OworICBoZWFkLmFwcGVuZENoaWxkKGxpbmspOworfQorCitmdW5jdGlvbiB0cnlUb0xvYWRQYXJh bXNGcm9tQ29va2llKCl7CisgIC8vU2V0IHRoZXNlIHRvIHdoYXQgdGhleSBzaG91bGQgYmUKKyAg dmFyIGRldV9nb29kID0gWzc2LCAxNTEsIDYxXTsKKyAgdmFyIGRldV9iYWQgPSBbMTkxLCA2Nywg NDFdOworCisgIC8vQWxzbyBzZXQgdGhlc2UgdG8gd2hhdCB0aGV5IHNob3VsZCBiZQorICB2YXIg cmVnX2dvb2QgPSBbMTM0LCAxODksIDE0MV07CisgIHZhciByZWdfYmFkID0gWzEzNCwgMTg5LCAx NDFdOworCisgIHZhciBjaGVja21hcmtfZGV1ID0gZ2V0RGV1Q29va2llKCJkZXUiKTsKKworICB2 YXIgY2hlY2ttYXJrc19iYWQgPSBkb2N1bWVudC5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKCJiYWQi KTsKKyAgdmFyIGNoZWNrbWFya3NfZ29vZCA9IGRvY3VtZW50LmdldEVsZW1lbnRzQnlDbGFzc05h bWUoImdvb2QiKTsKKyAgLy9HbyB0aHJvdWdoOyBtb2RpZnkgZ29vZCBhbmQgdGhlbiBiYWQKKyAg Zm9yICh2YXIgaSA9IDA7IGkgPCBjaGVja21hcmtzX2dvb2QubGVuZ3RoOyBpKyspeworICAgIHZh ciBwaWN0ID0gY2hlY2ttYXJrc19nb29kW2ldLmdldEVsZW1lbnRzQnlDbGFzc05hbWUoImJ1YmJs ZSBwaWN0b2dyYW0iKTsKKyAgICB2YXIgbGFiZWwgPSBjaGVja21hcmtzX2dvb2RbaV0uZ2V0RWxl bWVudHNCeUNsYXNzTmFtZSgibGFiZWwiKTsKKyAgICB2YXIgcmV2ID0gY2hlY2ttYXJrc19nb29k W2ldLmdldEVsZW1lbnRzQnlDbGFzc05hbWUoIm1lc3NhZ2UiKVswXS5nZXRFbGVtZW50c0J5Q2xh c3NOYW1lKCJyZXZpc2lvbi1udW1iZXIiKTsKKyAgICAKKyAgICBpZiAoY2hlY2ttYXJrX2RldSA9 PSAidHJ1ZSIpeworICAgICAgcGljdFswXS5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAncmdiKCcg KyBkZXVfZ29vZFswXSArICcsJyArIGRldV9nb29kWzFdICsgJywnICsgZGV1X2dvb2RbMl0gKyAn KSc7CisgICAgICBsYWJlbFswXS5zdHlsZS5jb2xvciA9ICdyZ2IoJyArIGRldV9nb29kWzBdICsg JywnICsgZGV1X2dvb2RbMV0gKyAnLCcgKyBkZXVfZ29vZFsyXSArICcpJzsKKyAgICAgIHJldlsw XS5zdHlsZS5jb2xvciA9ICdyZ2IoJyArIGRldV9nb29kWzBdICsgJywnICsgZGV1X2dvb2RbMV0g KyAnLCcgKyBkZXVfZ29vZFsyXSArICcpJzsKKyAgICB9CisgICAgZWxzZXsKKyAgICAgIHBpY3Rb MF0uc3R5bGUuYmFja2dyb3VuZENvbG9yID0gJ3JnYignICsgcmVnX2dvb2RbMF0gKyAnLCcgKyBy ZWdfZ29vZFsxXSArICcsJyArIHJlZ19nb29kWzJdICsgJyknOworICAgICAgbGFiZWxbMF0uc3R5 bGUuY29sb3IgPSAncmdiKCcgKyByZWdfZ29vZFswXSArICcsJyArIHJlZ19nb29kWzFdICsgJywn ICsgcmVnX2dvb2RbMl0gKyAnKSc7CisgICAgICByZXZbMF0uc3R5bGUuY29sb3IgPSAncmdiKCcg KyByZWdfZ29vZFswXSArICcsJyArIHJlZ19nb29kWzFdICsgJywnICsgcmVnX2dvb2RbMl0gKyAn KSc7CisgICAgfQorICB9CisKKyAgZm9yICh2YXIgaSA9IDA7IGkgPCBjaGVja21hcmtzX2JhZC5s ZW5ndGg7IGkrKyl7CisgICAgdmFyIHBpY3RvZ3JhbXMgPSBjaGVja21hcmtzX2JhZFtpXS5nZXRF bGVtZW50c0J5Q2xhc3NOYW1lKCJidWJibGUgcGljdG9ncmFtIik7CisgICAgdmFyIHBvcG92ZXJz ID0gY2hlY2ttYXJrc19iYWRbaV0uZ2V0RWxlbWVudHNCeUNsYXNzTmFtZSgiYnViYmxlIHBvcG92 ZXItdHJhY2tpbmciKTsKKyAgICB2YXIgbGFiZWwgPSBjaGVja21hcmtzX2JhZFtpXS5nZXRFbGVt ZW50c0J5Q2xhc3NOYW1lKCJsYWJlbCIpOworICAgIHZhciByZXYgPSBjaGVja21hcmtzX2JhZFtp XS5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKCJtZXNzYWdlIilbMF0uZ2V0RWxlbWVudHNCeUNsYXNz TmFtZSgicmV2aXNpb24tbnVtYmVyIik7CisgICAgCisgICAgdmFyIGFsbDsKKyAgICBpZiAocGlj dG9ncmFtcy5sZW5ndGggPT0gMCl7CisgICAgICBhbGwgPSBwb3BvdmVyczsKKyAgICB9CisgICAg ZWxzZXsKKyAgICAgIGFsbCA9IHBpY3RvZ3JhbXM7CisgICAgfQorCisgICAgaWYgKGNoZWNrbWFy a19kZXUgPT0gInRydWUiKXsKKyAgICAgIGFsbFswXS5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAn cmdiKCcgKyBkZXVfYmFkWzBdICsgJywnICsgZGV1X2JhZFsxXSArICcsJyArIGRldV9iYWRbMl0g KyAnKSc7CisgICAgICBsYWJlbFswXS5zdHlsZS5jb2xvciA9ICdyZ2IoJyArIGRldV9iYWRbMF0g KyAnLCcgKyBkZXVfYmFkWzFdICsgJywnICsgZGV1X2JhZFsyXSArICcpJzsKKyAgICAgIHJldlsw XS5zdHlsZS5jb2xvciA9ICdyZ2IoJyArIGRldV9iYWRbMF0gKyAnLCcgKyBkZXVfYmFkWzFdICsg JywnICsgZGV1X2JhZFsyXSArICcpJzsKKyAgICB9CisgICAgZWxzZXsKKyAgICAgIGFsbFswXS5z dHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAncmdiKCcgKyByZWdfYmFkWzBdICsgJywnICsgcmVnX2Jh ZFsxXSArICcsJyArIHJlZ19iYWRbMl0gKyAnKSc7CisgICAgICBsYWJlbFswXS5zdHlsZS5jb2xv ciA9ICdyZ2IoJyArIHJlZ19iYWRbMF0gKyAnLCcgKyByZWdfYmFkWzFdICsgJywnICsgcmVnX2Jh ZFsyXSArICcpJzsKKyAgICAgIHJldlswXS5zdHlsZS5jb2xvciA9ICdyZ2IoJyArIHJlZ19iYWRb MF0gKyAnLCcgKyByZWdfYmFkWzFdICsgJywnICsgcmVnX2JhZFsyXSArICcpJzsKKyAgICB9Cisg IH0KK30KKworZnVuY3Rpb24gc2V0RGV1Q29va2llKGtleSwgdmFsdWUpeworICB2YXIgZCA9IG5l dyBEYXRlKCk7CisgIC8vU2V0dGluZyB0aGlzIGZvciB0ZW4gZGF5cworICBkLnNldFRpbWUoZC5n ZXRUaW1lKCkgKyAoMTAgKiAyNCAqIDYwICogNjAgKiAxMDAwKSk7CisgIHZhciBleHBpcmVzID0g ImV4cGlyZXM9IitkLnRvVVRDU3RyaW5nKCk7CisgIGRvY3VtZW50LmNvb2tpZSA9IGtleSArICI9 IiArIHZhbHVlICsgIjsgIiArIGV4cGlyZXM7Cit9CisKK2Z1bmN0aW9uIGdldERldUNvb2tpZShr ZXkpeworICB2YXIgbmFtZSA9IGtleSArICI9IjsKKyAgdmFyIGF0dHJpYnV0ZXMgPSBkb2N1bWVu dC5jb29raWUuc3BsaXQoJzsnKTsKKyAgZm9yKHZhciBpID0gMDsgaSA8IGF0dHJpYnV0ZXMubGVu Z3RoOyBpKyspIHsKKyAgICB2YXIgYyA9IGF0dHJpYnV0ZXNbaV07CisgICAgd2hpbGUgKGMuY2hh ckF0KDApPT0nICcpIGMgPSBjLnN1YnN0cmluZygxKTsKKyAgICBpZiAoYy5pbmRleE9mKG5hbWUp ID09IDApIHsKKyAgICAgIHJldHVybiBjLnN1YnN0cmluZyhuYW1lLmxlbmd0aCxjLmxlbmd0aCk7 CisgICAgfQorICB9CisgIHJldHVybiAiIjsKKworfQpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvTWFpbi5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9NYWluLmpzCShy ZXZpc2lvbiAxODUxMjkpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9NYWluLmpzCSh3b3JraW5n IGNvcHkpCkBAIC0yMyw2ICsyMyw4IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCiAgKi8KIAorbG9hZENvbG9yQWNjZXNzaWJsZUJ1dHRvbnMoKTsKKwogdmFyIGhhc0J1YmJs ZXMgPSB0eXBlb2YgYnViYmxlUXVldWVTZXJ2ZXIgIT0gInVuZGVmaW5lZCI7CiB2YXIgQnViYmxl c0NhdGVnb3J5ID0gImJ1YmJsZXMiOwogCkBAIC0xNDUsMTMgKzE0NywyMiBAQCBmdW5jdGlvbiBk b2N1bWVudFJlYWR5KCkKICAgICByb3cuY2xhc3NMaXN0LmFkZCgiaGVhZGVycyIpOwogCiAgICAg dmFyIGhlYWRlciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInRoIik7CisgICAgdmFyIHRvZ2ds ZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgIHZhciB1bmhpZGVCdXR0b24g PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKwogICAgIHVuaGlkZUJ1dHRvbi5hZGRF dmVudExpc3RlbmVyKCJjbGljayIsIGZ1bmN0aW9uICgpIHsgc2V0dGluZ3MuY2xlYXJIaWRkZW5Q bGF0Zm9ybXMoKTsgfSk7CiAgICAgdW5oaWRlQnV0dG9uLnRleHRDb250ZW50ID0gIlNob3cgQWxs IFBsYXRmb3JtcyI7CiAgICAgdW5oaWRlQnV0dG9uLmNsYXNzTGlzdC5hZGQoImNlbGxCdXR0b24i LCAidW5oaWRlIiwgImhpZGRlbiIpOworCisgICAgdG9nZ2xlLnNldEF0dHJpYnV0ZSgib25jbGlj ayIsICJjaGFuZ2VQcmVmZXJlbmNlc0ZvckNvbG9yKCkiKTsKKyAgICB0b2dnbGUuc2V0QXR0cmli dXRlKCJjbGFzcyIsICJjZWxsQnV0dG9uIHVuaGlkZSBoaWRkZW4iKTsKKyAgICB0b2dnbGUudGV4 dENvbnRlbnQgPSAiY2hhbmdlIGNvbG9yIjsKKyAgICBoZWFkZXIuYXBwZW5kQ2hpbGQodG9nZ2xl KTsKKyAgICAKICAgICBoZWFkZXIuYXBwZW5kQ2hpbGQodW5oaWRlQnV0dG9uKTsKICAgICByb3cu YXBwZW5kQ2hpbGQoaGVhZGVyKTsKIAorCiAgICAgaGVhZGVyID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgidGgiKTsKICAgICBoZWFkZXIudGV4dENvbnRlbnQgPSAiQnVpbGRlcnMiOwogICAgIHJv dy5hcHBlbmRDaGlsZChoZWFkZXIpOwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvU2V0dGlu Z3MuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvU2V0dGluZ3MuanMJKHJl dmlzaW9uIDE4NTEyOSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1NldHRpbmdzLmpzCSh3b3Jr aW5nIGNvcHkpCkBAIC04Miw2ICs4Miw3IEBAIFNldHRpbmdzLnByb3RvdHlwZSA9IHsKICAgICAg ICAgaWYgKCFkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC5jb250YWlucygic2V0dGluZ3MtdmlzaWJs ZSIpKQogICAgICAgICAgICAgdGhpcy5maXJlU2V0dGluZ0xpc3RlbmVyKCJlbnRlcmVkU2V0dGlu Z3MiKTsKICAgICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QudG9nZ2xlKCJzZXR0aW5ncy12 aXNpYmxlIik7CisKICAgICB9LAogCiAgICAgdG9nZ2xlSGlkZGVuUGxhdGZvcm06IGZ1bmN0aW9u KHBsYXRmb3JtKQpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1N0eWxlcy9TdGF0dXNMaW5lVmlldy5jc3MK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1j b25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1N0eWxlcy9TdGF0dXNMaW5lVmlldy5jc3MJKHJl dmlzaW9uIDE4NTEyOSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TdHlsZXMvU3RhdHVzTGluZVZpZXcuY3Nz CSh3b3JraW5nIGNvcHkpCkBAIC01MCwxMCArNTAsNiBAQAogICAgIGJhY2tncm91bmQtY29sb3I6 IHJnYigxODEsIDE3NCwgMTQ4KTsKIH0KIAotLnN0YXR1cy1saW5lLmdvb2QgLmJ1YmJsZSB7Ci0g ICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDUwLCAyMTksIDcyKTsKLX0KLQogLnN0YXR1cy1saW5l LnVuYXV0aG9yaXplZCAuYnViYmxlIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMTcxLCA2 MSwgMTcxKTsKIH0KQEAgLTgwLDEwICs3Niw2IEBACiAgICAgZm9udC13ZWlnaHQ6IGJvbGQ7CiB9 CiAKLS5zdGF0dXMtbGluZS5iYWQgLmJ1YmJsZSB7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmdi KDE5NiwgNDksIDQ5KTsKLX0KLQogLnN0YXR1cy1saW5lLmJhZCAuYnViYmxlLnBpY3RvZ3JhbSB7 CiAgICAgZm9udC1mYW1pbHk6ICJNZW5sby1Cb2xkIiwgc2Fucy1zZXJpZjsKICAgICBmb250LXNp emU6IDIzcHg7CkBAIC0xMjksMjEgKzEyMSwxMSBAQAogICAgIGNvbG9yOiByZ2IoMTQ1LCAxMzUs IDk1KTsKIH0KIAotLnN0YXR1cy1saW5lLmdvb2QgLmxhYmVsLAotLnN0YXR1cy1saW5lLmdvb2Qg Lm1lc3NhZ2UgewotICAgIGNvbG9yOiByZ2IoNDAsIDE3NywgNTgpOwotfQotCiAuc3RhdHVzLWxp bmUuZGFuZ2VyIC5sYWJlbCwKIC5zdGF0dXMtbGluZS5kYW5nZXIgLm1lc3NhZ2UgewogICAgIGNv bG9yOiByZ2IoMjMwLCAxNzUsIDQ0KTsKIH0KIAotLnN0YXR1cy1saW5lLmJhZCAubGFiZWwsCi0u c3RhdHVzLWxpbmUuYmFkIC5tZXNzYWdlIHsKLSAgICBjb2xvcjogcmdiKDE5MSwgNjcsIDQxKTsK LX0KLQogLnN0YXR1cy1saW5lLnVuYXV0aG9yaXplZCAubGFiZWwsCiAuc3RhdHVzLWxpbmUudW5h dXRob3JpemVkIC5tZXNzYWdlIHsKICAgICBjb2xvcjogcmdiKDE3MSwgNjEsIDE3MSk7CkluZGV4 OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNf aHRtbC9kYXNoYm9hcmQvU3R5bGVzL1N0YXR1c0xpbmVWaWV3QnViYmxlREVVLmNzcwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9w dWJsaWNfaHRtbC9kYXNoYm9hcmQvU3R5bGVzL1N0YXR1c0xpbmVWaWV3QnViYmxlREVVLmNzcwko cmV2aXNpb24gMCkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TdHlsZXMvU3RhdHVzTGluZVZpZXdCdWJibGVE RVUuY3NzCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMTggQEAKKy5zdGF0dXMtbGluZS5nb29k IC5idWJibGUgeworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYig1MCwgMjE5LCA3Mik7Cit9CisK Ky5zdGF0dXMtbGluZS5iYWQgLmJ1YmJsZSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDE5 NiwgNDksIDQ5KTsKK30KKworLnN0YXR1cy1saW5lLmdvb2QgLmxhYmVsLAorLnN0YXR1cy1saW5l Lmdvb2QgLm1lc3NhZ2UgeworICAgIGNvbG9yOiByZ2IoNDAsIDE3NywgNTgpKTsKK30KKworLnN0 YXR1cy1saW5lLmJhZCAubGFiZWwsCisuc3RhdHVzLWxpbmUuYmFkIC5tZXNzYWdlIHsKKyAgICBj b2xvcjogcmdiKDE5MSwgNjcsIDQxKTsKK30KKwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1N0eWxlcy9T dGF0dXNMaW5lVmlld0J1YmJsZVJlZy5jc3MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1N0 eWxlcy9TdGF0dXNMaW5lVmlld0J1YmJsZVJlZy5jc3MJKHJldmlzaW9uIDApCisrKyBUb29scy9C dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNo Ym9hcmQvU3R5bGVzL1N0YXR1c0xpbmVWaWV3QnViYmxlUmVnLmNzcwkod29ya2luZyBjb3B5KQpA QCAtMCwwICsxLDE3IEBACisuc3RhdHVzLWxpbmUuYmFkIC5idWJibGUgeworICAgIGJhY2tncm91 bmQtY29sb3I6IHJnYigxOTEsIDY3LCA0MSk7Cit9CisKKy5zdGF0dXMtbGluZS5nb29kIC5idWJi bGUgeworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYig3NiwgMTUxLCA2MSk7Cit9CisKKy5zdGF0 dXMtbGluZS5nb29kIC5sYWJlbCwKKy5zdGF0dXMtbGluZS5nb29kIC5tZXNzYWdlIHsKKyAgICBj b2xvcjogcmdiKDc2LCAxNTEsIDYxKTsKK30KKworLnN0YXR1cy1saW5lLmJhZCAubGFiZWwsCisu c3RhdHVzLWxpbmUuYmFkIC5tZXNzYWdlIHsKKyAgICBjb2xvcjogcmdiKDE5MSwgNjcsIDQxKTsK K30K 254132 2015-06-02 18:26:23 -0700 2015-06-03 11:28:15 -0700 Patch bug-145570-20150602182607.patch text/plain 8614 mdaiter SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4NTEzNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDQxIEBACisyMDE1LTA2LTAyICBNYXR0aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29t PgorCisgICAgICAgIENoYW5nZWQgdGhlIGdyZWVucy9yZWRzIHNvIHRoYXQgdGhlcmUgd291bGQg YmUgbGVzcyBleWUtc3RyYWluCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDU1NzAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIwOTk0NDY4PgorCisg ICAgICAgIE1haW5seSBzaGlmdGluZyBDU1MgYXJvdW5kLCBkb2luZyBvZmYtbG9hZGluZyBvZiBD U1MgZmlsZXMgZnJvbSBicm93c2VyIHRvIGNoYW5nZSBjb2xvcnMuIFVzZWQgY29va2llcyB0byBz dG9yZSBjb2xvcnMuIENvbG9ycyBuZWNlc3NhcnkgZm9yIGFjY2Vzc2liaWxpdHkuIE1haW4gZ29h bCBmb3IgdGhpcyBpdGVyYXRpb24gd2FzIHRvIGN1dCBkb3duIG9uIGNvZGUKKworIAorICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBw b3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRz L01haW4uanM6IHVwZGF0ZWQgYSBsYXJnZSBwYXJ0IG9mIHRoZSBjb2RlYmFzZSB0byBvbmx5IHJl bHkgb24gQ1NTIGJvZHkgdGFncworICAgICAgICAodXBkYXRlSGlkZGVuUGxhdGZvcm1zKToKKyAg ICAgICAgKGxvYWRBY2Nlc3NpYmlsaXR5Q29sb3JzKToKKyAgICAgICAgKHVwZGF0ZUFjY2Vzc2li aWxpdHlDb2xvcnMpOgorICAgICAgICAoZG9jdW1lbnRSZWFkeSk6IG5lZWRlZCB0byBpbml0aWF0 ZSB0aGUgZmlyc3QgbG9hZGluZyBvZiBzZXR0aW5ncworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBw b3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRz L1NldHRpbmdzLmpzOiBOZWVkZWQgdG8gbWFrZSBhIHNlY3Rpb24gZm9yIHRvZ2dsaW5nIGNvbG9y cworICAgICAgICAoU2V0dGluZ3MucHJvdG90eXBlLnRvZ2dsZUhpZGRlblBsYXRmb3JtKToKKyAg ICAgICAgKFNldHRpbmdzLnByb3RvdHlwZS50b2dnbGVBY2Nlc3NpYmxlQ29sb3JzKToKKyAgICAg ICAgKFNldHRpbmdzLnByb3RvdHlwZS5jbGVhckhpZGRlblBsYXRmb3Jtcyk6CisgICAgICAgICog QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFz aGJvYXJkL1N0eWxlcy9TdGF0dXNMaW5lVmlldy5jc3M6IE5lZWRlZCB0byBtYWtlIHNvbWUgY3Vz dG9tIGNoYW5nZXMgdG8gYWRkIGluIHN1cHBvcnQgZm9yIGRldGVjdGluZyB0aGUgQ1NTIGZpbHRl ciBpbiB0aGUgYm9keSB0YWcgYW5kIGNoYW5naW5nIHRoZSBjb2xvciBiYXNlZCBvZmYgb2YgaXQK KyAgICAgICAgKC5zdGF0dXMtbGluZS5uZXV0cmFsIC5idWJibGUpOgorICAgICAgICAoLnN0YXR1 cy1saW5lLnVuYXV0aG9yaXplZCAuYnViYmxlKToKKyAgICAgICAgKC5zdGF0dXMtbGluZS5kYW5n ZXIgLmJ1YmJsZS5waWN0b2dyYW0pOgorICAgICAgICAoLnN0YXR1cy1saW5lLmJhZCAuYnViYmxl LnBpY3RvZ3JhbSk6CisgICAgICAgICguc3RhdHVzLWxpbmUubm8tYnViYmxlIC5tZXNzYWdlKToK KyAgICAgICAgKC5zdGF0dXMtbGluZS5iYWQgLmJ1YmJsZSk6CisgICAgICAgICguc3RhdHVzLWxp bmUuZ29vZCAuYnViYmxlKToKKyAgICAgICAgKC5zdGF0dXMtbGluZS5nb29kIC5tZXNzYWdlKToK KyAgICAgICAgKC5zdGF0dXMtbGluZS5iYWQgLm1lc3NhZ2UpOgorICAgICAgICAoYm9keS5hY2Nl c3NpYmxlLWNvbG9ycyAuc3RhdHVzLWxpbmUuZ29vZCAuYnViYmxlKToKKyAgICAgICAgKGJvZHku YWNjZXNzaWJsZS1jb2xvcnMgLnN0YXR1cy1saW5lLmJhZCAuYnViYmxlKToKKyAgICAgICAgKGJv ZHkuYWNjZXNzaWJsZS1jb2xvcnMgLnN0YXR1cy1saW5lLmdvb2QgLm1lc3NhZ2UpOgorICAgICAg ICAoYm9keS5hY2Nlc3NpYmxlLWNvbG9ycyAuc3RhdHVzLWxpbmUuYmFkIC5tZXNzYWdlKToKKyAg ICAgICAgKC5zdGF0dXMtbGluZS5kYW5nZXIgLm1lc3NhZ2UpOgorICAgICAgICAoLnN0YXR1cy1s aW5lLnVuYXV0aG9yaXplZCAubWVzc2FnZSk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL2luZGV4Lmh0bWw6 IFRvb2sgb3V0IHNvbWUgbGluZXMgbG9hZGluZyBleHRyYSBKYXZhc2NyaXB0L0NTUworCiAyMDE1 LTA2LTAyICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBidWlsZC1q c2MncyAtLWNsb29wIG9wdGlvbiBpcyBicm9rZW4uCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvaW5kZXgu aHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvaW5kZXguaHRtbAkocmV2aXNpb24gMTg1 MTMwKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv cHVibGljX2h0bWwvZGFzaGJvYXJkL2luZGV4Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTMxLDcg KzMxLDcgQEAgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICAgIDxsaW5rIHJlbD0i c3R5bGVzaGVldCIgaHJlZj0iU3R5bGVzL1BvcG92ZXIuY3NzIj48L2xpbms+CiAgICAgPGxpbmsg cmVsPSJzdHlsZXNoZWV0IiBocmVmPSJTdHlsZXMvUXVldWVWaWV3LmNzcyI+PC9saW5rPgogICAg IDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iU3R5bGVzL1N0YXR1c0xpbmVWaWV3LmNzcyI+ PC9saW5rPgotCisgICAgCiAgICAgPHNjcmlwdCBzcmM9IlNjcmlwdHMvVXRpbGl0aWVzLmpzIj48 L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iU2NyaXB0cy9CYXNlT2JqZWN0LmpzIj48L3Njcmlw dD4KICAgICA8c2NyaXB0IHNyYz0iU2NyaXB0cy9EYXNoYm9hcmQuanMiPjwvc2NyaXB0PgpJbmRl eDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvTWFpbi5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9h cmQvU2NyaXB0cy9NYWluLmpzCShyZXZpc2lvbiAxODUxMzApCisrKyBUb29scy9CdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2Ny aXB0cy9NYWluLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xMzYsNiArMTM2LDI2IEBAIGZ1bmN0aW9u IHVwZGF0ZUhpZGRlblBsYXRmb3JtcygpCiAgICAgICAgIHVuaGlkZUJ1dHRvbi5jbGFzc0xpc3Qu YWRkKCJoaWRkZW4iKTsKIH0KIAorZnVuY3Rpb24gbG9hZEFjY2Vzc2liaWxpdHlDb2xvcnMoKXsK KyAgICB2YXIgaXNDdXJyZW50bHlBY3RpdmF0ZWQgPSBzZXR0aW5ncy5nZXRPYmplY3QoImFjY2Vz c2liaWxpdHlPcHRpb25zIik7CisgICAgaWYgKCFpc0N1cnJlbnRseUFjdGl2YXRlZCkKKyAgICAg ICAgaXNDdXJyZW50bHlBY3RpdmF0ZWQgPSBmYWxzZTsKKyAgICBlbHNlCisgICAgICAgIHRvZ2ds ZUFjY2Vzc2libGVDb2xvcnMoKTsKK30KKworZnVuY3Rpb24gdXBkYXRlQWNjZXNzaWJpbGl0eUNv bG9ycygpeworICAgIAorICAgIHZhciBpc0N1cnJlbnRseUFjdGl2YXRlZCA9IHNldHRpbmdzLmdl dE9iamVjdCgiYWNjZXNzaWJpbGl0eU9wdGlvbnMiKTsKKyAgICBpZiAoIWlzQ3VycmVudGx5QWN0 aXZhdGVkKQorICAgICAgICBpc0N1cnJlbnRseUFjdGl2YXRlZCA9IGZhbHNlOworICAgIAorICAg IGlmIChpc0N1cnJlbnRseUFjdGl2YXRlZCA9PSB0cnVlKQorICAgICAgICBzZXR0aW5ncy5zZXRP YmplY3QoImFjY2Vzc2liaWxpdHlPcHRpb25zIiwgZmFsc2UpOworICAgIGVsc2UKKyAgICAgICAg c2V0dGluZ3Muc2V0T2JqZWN0KCJhY2Nlc3NpYmlsaXR5T3B0aW9ucyIsIHRydWUpOworfQorCiBm dW5jdGlvbiBkb2N1bWVudFJlYWR5KCkKIHsKICAgICB2YXIgdGFibGUgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJ0YWJsZSIpOwpAQCAtMTQ1LDEzICsxNjUsMTcgQEAgZnVuY3Rpb24gZG9jdW1l bnRSZWFkeSgpCiAgICAgcm93LmNsYXNzTGlzdC5hZGQoImhlYWRlcnMiKTsKIAogICAgIHZhciBo ZWFkZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJ0aCIpOworICAgIHZhciB0b2dnbGUgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICB2YXIgdW5oaWRlQnV0dG9uID0gZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisKICAgICB1bmhpZGVCdXR0b24uYWRkRXZlbnRM aXN0ZW5lcigiY2xpY2siLCBmdW5jdGlvbiAoKSB7IHNldHRpbmdzLmNsZWFySGlkZGVuUGxhdGZv cm1zKCk7IH0pOwogICAgIHVuaGlkZUJ1dHRvbi50ZXh0Q29udGVudCA9ICJTaG93IEFsbCBQbGF0 Zm9ybXMiOwogICAgIHVuaGlkZUJ1dHRvbi5jbGFzc0xpc3QuYWRkKCJjZWxsQnV0dG9uIiwgInVu aGlkZSIsICJoaWRkZW4iKTsKKwogICAgIGhlYWRlci5hcHBlbmRDaGlsZCh1bmhpZGVCdXR0b24p OwogICAgIHJvdy5hcHBlbmRDaGlsZChoZWFkZXIpOwogCisKICAgICBoZWFkZXIgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJ0aCIpOwogICAgIGhlYWRlci50ZXh0Q29udGVudCA9ICJCdWlsZGVy cyI7CiAgICAgcm93LmFwcGVuZENoaWxkKGhlYWRlcik7CkBAIC0yNjIsNiArMjg2LDE5IEBAIGZ1 bmN0aW9uIGRvY3VtZW50UmVhZHkoKQogCiAgICAgICAgIHVwZGF0ZUhpZGRlblBsYXRmb3Jtcygp OwogICAgICAgICBzZXR0aW5ncy5hZGRTZXR0aW5nTGlzdGVuZXIoImhpZGRlblBsYXRmb3JtcyIs IHVwZGF0ZUhpZGRlblBsYXRmb3Jtcyk7CisgICAgICAgIAorICAgICAgICB0b2dnbGUuYWRkRXZl bnRMaXN0ZW5lcigiY2xpY2siLCBmdW5jdGlvbigpIHsgc2V0dGluZ3MudG9nZ2xlQWNjZXNzaWJs ZUNvbG9ycygpOyB9KTsKKyAgICAgICAgdG9nZ2xlLnNldEF0dHJpYnV0ZSgiY2xhc3MiLCAiY2Vs bEJ1dHRvbiB1bmhpZGUgaGlkZGVuIik7CisgICAgICAgIHRvZ2dsZS50ZXh0Q29udGVudCA9ICJj aGFuZ2UgY29sb3IiOworICAgICAgICBoZWFkZXIuYXBwZW5kQ2hpbGQodG9nZ2xlKTsKKwlzZXR0 aW5ncy5hZGRTZXR0aW5nTGlzdGVuZXIoInRvZ2dsZUFjY2Vzc2liaWxpdHkiLCB1cGRhdGVBY2Nl c3NpYmlsaXR5Q29sb3JzKTsKKyAgICAgICAgCisgICAgICAgIHZhciBpc0N1cnJlbnRseUFjdGl2 YXRlZCA9IHNldHRpbmdzLmdldE9iamVjdCgiYWNjZXNzaWJpbGl0eU9wdGlvbnMiKTsKKyAgICAg ICAgaWYgKCFpc0N1cnJlbnRseUFjdGl2YXRlZCkKKyAgICAgICAgICAgIGlzQ3VycmVudGx5QWN0 aXZhdGVkID0gZmFsc2U7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRvZ2dsZUFjY2Vzc2li bGVDb2xvcnMoKTsKKwogICAgIH0KIH0KIApJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvU2V0 dGluZ3MuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Vi a2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvU2V0dGluZ3MuanMJ KHJldmlzaW9uIDE4NTEzMCkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1NldHRpbmdzLmpzCSh3 b3JraW5nIGNvcHkpCkBAIC0xMDAsNiArMTAwLDEyIEBAIFNldHRpbmdzLnByb3RvdHlwZSA9IHsK ICAgICAgICAgdGhpcy5maXJlU2V0dGluZ0xpc3RlbmVyKCJoaWRkZW5QbGF0Zm9ybXMiKTsKICAg ICB9LAogCisgICAgdG9nZ2xlQWNjZXNzaWJsZUNvbG9yczogZnVuY3Rpb24oKXsKKyAgICAgICAg aWYgKCFkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC5jb250YWlucygiYWNjZXNzaWJsZS1jb2xvcnMi KSkKKyAgICAgICAgICAgdGhpcy5maXJlU2V0dGluZ0xpc3RlbmVyKCJhY2Nlc3NpYmxlLWNvbG9y cyIpOworICAgICAgICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC50b2dnbGUoImFjY2Vzc2libGUt Y29sb3JzIik7CisgICAgfSwKKwogICAgIGNsZWFySGlkZGVuUGxhdGZvcm1zOiBmdW5jdGlvbigp CiAgICAgewogICAgICAgICB0aGlzLnNldE9iamVjdCgiaGlkZGVuUGxhdGZvcm1zIiwgW10pOwpJ bmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVi bGljX2h0bWwvZGFzaGJvYXJkL1N0eWxlcy9TdGF0dXNMaW5lVmlldy5jc3MKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1N0eWxlcy9TdGF0dXNMaW5lVmlldy5jc3MJKHJldmlzaW9uIDE4NTEz MCkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1 YmxpY19odG1sL2Rhc2hib2FyZC9TdHlsZXMvU3RhdHVzTGluZVZpZXcuY3NzCSh3b3JraW5nIGNv cHkpCkBAIC01MCwxMCArNTAsNiBAQAogICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigxODEsIDE3 NCwgMTQ4KTsKIH0KIAotLnN0YXR1cy1saW5lLmdvb2QgLmJ1YmJsZSB7Ci0gICAgYmFja2dyb3Vu ZC1jb2xvcjogcmdiKDUwLCAyMTksIDcyKTsKLX0KLQogLnN0YXR1cy1saW5lLnVuYXV0aG9yaXpl ZCAuYnViYmxlIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMTcxLCA2MSwgMTcxKTsKIH0K QEAgLTgwLDEwICs3Niw2IEBACiAgICAgZm9udC13ZWlnaHQ6IGJvbGQ7CiB9CiAKLS5zdGF0dXMt bGluZS5iYWQgLmJ1YmJsZSB7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDE5NiwgNDksIDQ5 KTsKLX0KLQogLnN0YXR1cy1saW5lLmJhZCAuYnViYmxlLnBpY3RvZ3JhbSB7CiAgICAgZm9udC1m YW1pbHk6ICJNZW5sby1Cb2xkIiwgc2Fucy1zZXJpZjsKICAgICBmb250LXNpemU6IDIzcHg7CkBA IC0xMjksMjEgKzEyMSw0NyBAQAogICAgIGNvbG9yOiByZ2IoMTQ1LCAxMzUsIDk1KTsKIH0KIAor LnN0YXR1cy1saW5lLmJhZCAuYnViYmxlIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMTkx LCA2NywgNDEpOworfQorCisuc3RhdHVzLWxpbmUuZ29vZCAuYnViYmxlIHsKKyAgICBiYWNrZ3Jv dW5kLWNvbG9yOiByZ2IoNzYsIDE1MSwgNjEpOworfQorCiAuc3RhdHVzLWxpbmUuZ29vZCAubGFi ZWwsCiAuc3RhdHVzLWxpbmUuZ29vZCAubWVzc2FnZSB7CisgICAgY29sb3I6IHJnYig3NiwgMTUx LCA2MSk7Cit9CisKKy5zdGF0dXMtbGluZS5iYWQgLmxhYmVsLAorLnN0YXR1cy1saW5lLmJhZCAu bWVzc2FnZSB7CisgICAgY29sb3I6IHJnYigxOTEsIDY3LCA0MSk7Cit9CisKK2JvZHkuYWNjZXNz aWJsZS1jb2xvcnMgLnN0YXR1cy1saW5lLmdvb2QgLmJ1YmJsZSB7CisgICAgYmFja2dyb3VuZC1j b2xvcjogcmdiKDUwLCAyMTksIDcyKTsKK30KKworYm9keS5hY2Nlc3NpYmxlLWNvbG9ycyAuc3Rh dHVzLWxpbmUuYmFkIC5idWJibGUgeworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigxOTYsIDQ5 LCA0OSk7Cit9CisKK2JvZHkuYWNjZXNzaWJsZS1jb2xvcnMgLnN0YXR1cy1saW5lLmdvb2QgLmxh YmVsLAorYm9keS5hY2Nlc3NpYmxlLWNvbG9ycyAuc3RhdHVzLWxpbmUuZ29vZCAubWVzc2FnZSB7 CiAgICAgY29sb3I6IHJnYig0MCwgMTc3LCA1OCk7CiB9CiAKK2JvZHkuYWNjZXNzaWJsZS1jb2xv cnMgLnN0YXR1cy1saW5lLmJhZCAubGFiZWwsCitib2R5LmFjY2Vzc2libGUtY29sb3JzIC5zdGF0 dXMtbGluZS5iYWQgLm1lc3NhZ2UgeworICAgIGNvbG9yOiByZ2IoMTkxLCA2NywgNDEpOworfQor CiAuc3RhdHVzLWxpbmUuZGFuZ2VyIC5sYWJlbCwKIC5zdGF0dXMtbGluZS5kYW5nZXIgLm1lc3Nh Z2UgewogICAgIGNvbG9yOiByZ2IoMjMwLCAxNzUsIDQ0KTsKIH0KIAotLnN0YXR1cy1saW5lLmJh ZCAubGFiZWwsCi0uc3RhdHVzLWxpbmUuYmFkIC5tZXNzYWdlIHsKLSAgICBjb2xvcjogcmdiKDE5 MSwgNjcsIDQxKTsKLX0KLQogLnN0YXR1cy1saW5lLnVuYXV0aG9yaXplZCAubGFiZWwsCiAuc3Rh dHVzLWxpbmUudW5hdXRob3JpemVkIC5tZXNzYWdlIHsKICAgICBjb2xvcjogcmdiKDE3MSwgNjEs IDE3MSk7Cg== 254190 2015-06-03 11:28:20 -0700 2015-06-03 15:10:16 -0700 Patch bug-145570-20150603112805.patch text/plain 7346 mdaiter SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4NTE1NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDQxIEBACisyMDE1LTA2LTAzICBNYXR0aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29t PgorCisgICAgICAgIENoYW5nZWQgdGhlIGdyZWVucy9yZWRzIHNvIHRoYXQgdGhlcmUgd291bGQg YmUgbGVzcyBleWUtc3RyYWluCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDU1NzAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIwOTk0NDY4PgorCisg ICAgICAgIE1haW5seSBzaGlmdGluZyBDU1MgYXJvdW5kLCBkb2luZyBvZmYtbG9hZGluZyBvZiBD U1MgZmlsZXMgZnJvbSAKKyAgICAgICAgYnJvd3NlciB0byBjaGFuZ2UgY29sb3JzLiBVc2VkIGNv b2tpZXMgdG8gc3RvcmUgY29sb3JzLiBDb2xvcnMgCisgICAgICAgIG5lY2Vzc2FyeSBmb3IgYWNj ZXNzaWJpbGl0eS4gTWFpbiBnb2FsIGZvciB0aGlzIGl0ZXJhdGlvbiB3YXMgdG8gCisgICAgICAg IGN1dCBkb3duIG9uIGNvZGUuIEN1dCBkb3duIG9uIG5vdGlmaWNhdGlvbnMsIG90aGVyIGNvZGUg Ym9nZ2luZyBkb3duIHN5c3RlbQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv cHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvTWFpbi5qczoKKyAgICAgICAgKHVwZGF0ZUhp ZGRlblBsYXRmb3Jtcyk6CisgICAgICAgIChhcHBseUFjY2Vzc2libGVDb2xvclNldHRpbmcpOiBp bml0aWFsIG1ldGhvZCBmb3IgYXBwbHlpbmcgYWNjZXNzaWJsZSBjb2xvcnMKKyAgICAgICAgKHVw ZGF0ZUFjY2Vzc2liaWxpdHlDb2xvcnMpOiB1cGRhdGluZyBhY2Nlc3NpYmxlIGNvbG9ycyBhbmQg c3RvcmluZworICAgICAgICAoZG9jdW1lbnRSZWFkeSk6IGFkZGVkIGJ1dHRvbgorICAgICAgICAq IEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rh c2hib2FyZC9TdHlsZXMvTWFpbi5jc3M6CisgICAgICAgICgucG9wb3Zlci10cmFja2luZzpob3Zl cik6CisgICAgICAgICguYWNjZXNzaWJpbGl0eUJ1dHRvbik6IG5lZWRlZCBjdXN0b20gQ1NTIGZv ciBhY2Nlc3NpYmlsaXR5IGJ1dHRvbgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TdHlsZXMvU3RhdHVzTGlu ZVZpZXcuY3NzOgorICAgICAgICAoLnN0YXR1cy1saW5lLm5ldXRyYWwgLmJ1YmJsZSk6CisgICAg ICAgICguc3RhdHVzLWxpbmUudW5hdXRob3JpemVkIC5idWJibGUpOgorICAgICAgICAoLnN0YXR1 cy1saW5lLmRhbmdlciAuYnViYmxlLnBpY3RvZ3JhbSk6CisgICAgICAgICguc3RhdHVzLWxpbmUu YmFkIC5idWJibGUucGljdG9ncmFtKToKKyAgICAgICAgKC5zdGF0dXMtbGluZS5uby1idWJibGUg Lm1lc3NhZ2UpOgorICAgICAgICAoLnN0YXR1cy1saW5lLmJhZCAuYnViYmxlKToKKyAgICAgICAg KC5zdGF0dXMtbGluZS5nb29kIC5idWJibGUpOgorICAgICAgICAoLnN0YXR1cy1saW5lLmdvb2Qg Lm1lc3NhZ2UpOgorICAgICAgICAoLnN0YXR1cy1saW5lLmJhZCAubWVzc2FnZSk6CisgICAgICAg IChib2R5LmFjY2Vzc2libGUtY29sb3JzIC5zdGF0dXMtbGluZS5nb29kIC5idWJibGUpOgorICAg ICAgICAoYm9keS5hY2Nlc3NpYmxlLWNvbG9ycyAuc3RhdHVzLWxpbmUuYmFkIC5idWJibGUpOgor ICAgICAgICAoYm9keS5hY2Nlc3NpYmxlLWNvbG9ycyAuc3RhdHVzLWxpbmUuZ29vZCAubWVzc2Fn ZSk6CisgICAgICAgIChib2R5LmFjY2Vzc2libGUtY29sb3JzIC5zdGF0dXMtbGluZS5iYWQgLm1l c3NhZ2UpOgorICAgICAgICAoLnN0YXR1cy1saW5lLmRhbmdlciAubWVzc2FnZSk6CisgICAgICAg ICguc3RhdHVzLWxpbmUudW5hdXRob3JpemVkIC5tZXNzYWdlKToKKwogMjAxNS0wNi0wMyAgQnJh ZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjE4 MzQ5OCk6IENlcnRhaW4gdHlwZXMgb2YgZnJhbWUgbG9hZHMgaW4gaWZyYW1lcyB3aXRoIDxiYXNl IHRhcmdldD0iX2JsYW5rIj4gY2FuIG9wZW4gdXJscyBpbiBuZXcgd2luZG93L3RhYnMKSW5kZXg6 IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19o dG1sL2Rhc2hib2FyZC9TY3JpcHRzL01haW4uanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvTWFpbi5qcwkocmV2aXNpb24gMTg1MTU1KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvTWFpbi5qcwkod29ya2luZyBjb3B5KQpAQCAtMTM2LDYgKzEzNiwyNCBAQCBmdW5jdGlvbiB1 cGRhdGVIaWRkZW5QbGF0Zm9ybXMoKQogICAgICAgICB1bmhpZGVCdXR0b24uY2xhc3NMaXN0LmFk ZCgiaGlkZGVuIik7CiB9CiAKK2Z1bmN0aW9uIGFwcGx5QWNjZXNzaWJsZUNvbG9yU2V0dGluZygp Cit7CisgICAgdmFyIHVzZUFjY2Vzc2libGVDb2xvcnMgPSBzZXR0aW5ncy5nZXRPYmplY3QoImFj Y2Vzc2liaWxpdHlPcHRpb25zIik7CisgICAgaWYgKHVzZUFjY2Vzc2libGVDb2xvcnMpeworICAg ICAgICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC50b2dnbGUoImFjY2Vzc2libGUtY29sb3JzIik7 CisgICAgfQorfQorCitmdW5jdGlvbiB1cGRhdGVBY2Nlc3NpYmlsaXR5Q29sb3JzKCkKK3sKKyAg ICB2YXIgaXNDdXJyZW50bHlBY3RpdmF0ZWQgPSBzZXR0aW5ncy5nZXRPYmplY3QoImFjY2Vzc2li aWxpdHlPcHRpb25zIik7CisgICAgaWYgKGlzQ3VycmVudGx5QWN0aXZhdGVkID09IHVuZGVmaW5l ZCkKKyAgICAgICAgaXNDdXJyZW50bHlBY3RpdmF0ZWQgPSBmYWxzZTsKKyAgICAKKyAgICBzZXR0 aW5ncy5zZXRPYmplY3QoImFjY2Vzc2liaWxpdHlPcHRpb25zIiwgIWlzQ3VycmVudGx5QWN0aXZh dGVkKTsKKyAgICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC50b2dnbGUoImFjY2Vzc2libGUtY29s b3JzIik7Cit9CisKIGZ1bmN0aW9uIGRvY3VtZW50UmVhZHkoKQogewogICAgIHZhciB0YWJsZSA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInRhYmxlIik7CkBAIC0xNDQsMTEgKzE2MiwxMiBAQCBm dW5jdGlvbiBkb2N1bWVudFJlYWR5KCkKICAgICB2YXIgcm93ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgidHIiKTsKICAgICByb3cuY2xhc3NMaXN0LmFkZCgiaGVhZGVycyIpOwogCi0gICAgdmFy IGhlYWRlciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInRoIik7CiAgICAgdmFyIHVuaGlkZUJ1 dHRvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgIHVuaGlkZUJ1dHRvbi5h ZGRFdmVudExpc3RlbmVyKCJjbGljayIsIGZ1bmN0aW9uICgpIHsgc2V0dGluZ3MuY2xlYXJIaWRk ZW5QbGF0Zm9ybXMoKTsgfSk7CiAgICAgdW5oaWRlQnV0dG9uLnRleHRDb250ZW50ID0gIlNob3cg QWxsIFBsYXRmb3JtcyI7CiAgICAgdW5oaWRlQnV0dG9uLmNsYXNzTGlzdC5hZGQoImNlbGxCdXR0 b24iLCAidW5oaWRlIiwgImhpZGRlbiIpOworCisgICAgdmFyIGhlYWRlciA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoInRoIik7IAogICAgIGhlYWRlci5hcHBlbmRDaGlsZCh1bmhpZGVCdXR0b24p OwogICAgIHJvdy5hcHBlbmRDaGlsZChoZWFkZXIpOwogCkBAIC0yNjAsNiArMjc5LDEzIEBAIGZ1 bmN0aW9uIGRvY3VtZW50UmVhZHkoKQogICAgICAgICBzZXR0aW5nc0J1dHRvbi5jbGFzc0xpc3Qu YWRkKCJzZXR0aW5ncyIpOwogICAgICAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKHNldHRp bmdzQnV0dG9uKTsKIAorICAgICAgICB2YXIgdG9nZ2xlQWNjZXNzaWJpbGl0eUNvbG9yQnV0dG9u ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgIHRvZ2dsZUFjY2Vzc2li aWxpdHlDb2xvckJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIGZ1bmN0aW9uKCkgeyB1 cGRhdGVBY2Nlc3NpYmlsaXR5Q29sb3JzKCk7IH0pOworICAgICAgICB0b2dnbGVBY2Nlc3NpYmls aXR5Q29sb3JCdXR0b24uc2V0QXR0cmlidXRlKCJjbGFzcyIsICJjZWxsQnV0dG9uIHVuaGlkZSBo aWRkZW4gYWNjZXNzaWJpbGl0eUJ1dHRvbiIpOworICAgICAgICB0b2dnbGVBY2Nlc3NpYmlsaXR5 Q29sb3JCdXR0b24udGV4dENvbnRlbnQgPSAiZW5hYmxlIGFjY2Vzc2liaWxpdHkgY29sb3JzIjsK KyAgICAgICAgZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZCh0b2dnbGVBY2Nlc3NpYmlsaXR5Q29s b3JCdXR0b24pOworICAgICAgICBhcHBseUFjY2Vzc2libGVDb2xvclNldHRpbmcoKTsKKyAgICAg ICAgCiAgICAgICAgIHVwZGF0ZUhpZGRlblBsYXRmb3JtcygpOwogICAgICAgICBzZXR0aW5ncy5h ZGRTZXR0aW5nTGlzdGVuZXIoImhpZGRlblBsYXRmb3JtcyIsIHVwZGF0ZUhpZGRlblBsYXRmb3Jt cyk7CiAgICAgfQpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1N0eWxlcy9NYWluLmNzcwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJs aWNfaHRtbC9kYXNoYm9hcmQvU3R5bGVzL01haW4uY3NzCShyZXZpc2lvbiAxODUxNTUpCisrKyBU b29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRt bC9kYXNoYm9hcmQvU3R5bGVzL01haW4uY3NzCSh3b3JraW5nIGNvcHkpCkBAIC0yMDAsMyArMjAw LDkgQEAgdGFibGUucXVldWUtZ3JpZCB0ci5wbGF0Zm9ybS5saW51eC1lZmwgaQogLnBvcG92ZXIt dHJhY2tpbmc6aG92ZXIgewogICAgIHRleHQtc2hhZG93OiAwcHggMHB4IDNweCByZ2JhKDAsIDAs IDAsIDAuMikKIH0KKworLmFjY2Vzc2liaWxpdHlCdXR0b24geworICAgIHBvc2l0aW9uOiBhYnNv bHV0ZTsKKyAgICBsZWZ0OiAxNXB4OworICAgIHRvcDogNTVweDsKK30KSW5kZXg6IFRvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hi b2FyZC9TdHlsZXMvU3RhdHVzTGluZVZpZXcuY3NzCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2Fy ZC9TdHlsZXMvU3RhdHVzTGluZVZpZXcuY3NzCShyZXZpc2lvbiAxODUxNTUpCisrKyBUb29scy9C dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNo Ym9hcmQvU3R5bGVzL1N0YXR1c0xpbmVWaWV3LmNzcwkod29ya2luZyBjb3B5KQpAQCAtNTAsMTAg KzUwLDYgQEAKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMTgxLCAxNzQsIDE0OCk7CiB9CiAK LS5zdGF0dXMtbGluZS5nb29kIC5idWJibGUgewotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYig1 MCwgMjE5LCA3Mik7Ci19Ci0KIC5zdGF0dXMtbGluZS51bmF1dGhvcml6ZWQgLmJ1YmJsZSB7CiAg ICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDE3MSwgNjEsIDE3MSk7CiB9CkBAIC04MCwxMCArNzYs NiBAQAogICAgIGZvbnQtd2VpZ2h0OiBib2xkOwogfQogCi0uc3RhdHVzLWxpbmUuYmFkIC5idWJi bGUgewotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigxOTYsIDQ5LCA0OSk7Ci19Ci0KIC5zdGF0 dXMtbGluZS5iYWQgLmJ1YmJsZS5waWN0b2dyYW0gewogICAgIGZvbnQtZmFtaWx5OiAiTWVubG8t Qm9sZCIsIHNhbnMtc2VyaWY7CiAgICAgZm9udC1zaXplOiAyM3B4OwpAQCAtMTI5LDIxICsxMjEs NDcgQEAKICAgICBjb2xvcjogcmdiKDE0NSwgMTM1LCA5NSk7CiB9CiAKKy5zdGF0dXMtbGluZS5i YWQgLmJ1YmJsZSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDE5MSwgNjcsIDQxKTsKK30K KworLnN0YXR1cy1saW5lLmdvb2QgLmJ1YmJsZSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdi KDc2LCAxNTEsIDYxKTsKK30KKwogLnN0YXR1cy1saW5lLmdvb2QgLmxhYmVsLAogLnN0YXR1cy1s aW5lLmdvb2QgLm1lc3NhZ2UgeworICAgIGNvbG9yOiByZ2IoNzYsIDE1MSwgNjEpOworfQorCisu c3RhdHVzLWxpbmUuYmFkIC5sYWJlbCwKKy5zdGF0dXMtbGluZS5iYWQgLm1lc3NhZ2UgeworICAg IGNvbG9yOiByZ2IoMTkxLCA2NywgNDEpOworfQorCitib2R5LmFjY2Vzc2libGUtY29sb3JzIC5z dGF0dXMtbGluZS5nb29kIC5idWJibGUgeworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYig1MCwg MjE5LCA3Mik7Cit9CisKK2JvZHkuYWNjZXNzaWJsZS1jb2xvcnMgLnN0YXR1cy1saW5lLmJhZCAu YnViYmxlIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMTk2LCA0OSwgNDkpOworfQorCiti b2R5LmFjY2Vzc2libGUtY29sb3JzIC5zdGF0dXMtbGluZS5nb29kIC5sYWJlbCwKK2JvZHkuYWNj ZXNzaWJsZS1jb2xvcnMgLnN0YXR1cy1saW5lLmdvb2QgLm1lc3NhZ2UgewogICAgIGNvbG9yOiBy Z2IoNDAsIDE3NywgNTgpOwogfQogCitib2R5LmFjY2Vzc2libGUtY29sb3JzIC5zdGF0dXMtbGlu ZS5iYWQgLmxhYmVsLAorYm9keS5hY2Nlc3NpYmxlLWNvbG9ycyAuc3RhdHVzLWxpbmUuYmFkIC5t ZXNzYWdlIHsKKyAgICBjb2xvcjogcmdiKDE5MSwgNjcsIDQxKTsKK30KKwogLnN0YXR1cy1saW5l LmRhbmdlciAubGFiZWwsCiAuc3RhdHVzLWxpbmUuZGFuZ2VyIC5tZXNzYWdlIHsKICAgICBjb2xv cjogcmdiKDIzMCwgMTc1LCA0NCk7CiB9CiAKLS5zdGF0dXMtbGluZS5iYWQgLmxhYmVsLAotLnN0 YXR1cy1saW5lLmJhZCAubWVzc2FnZSB7Ci0gICAgY29sb3I6IHJnYigxOTEsIDY3LCA0MSk7Ci19 Ci0KIC5zdGF0dXMtbGluZS51bmF1dGhvcml6ZWQgLmxhYmVsLAogLnN0YXR1cy1saW5lLnVuYXV0 aG9yaXplZCAubWVzc2FnZSB7CiAgICAgY29sb3I6IHJnYigxNzEsIDYxLCAxNzEpOwo= 254212 2015-06-03 15:10:20 -0700 2015-06-03 18:28:05 -0700 Patch bug-145570-20150603151006.patch text/plain 9321 mdaiter SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4NTE3MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDUwIEBACisyMDE1LTA2LTAzICBNYXR0aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29t PgorCisgICAgICAgIEFkZGVkIGEgcGF0Y2ggc28gdGhhdCB0aGUgY29sb3JzIGRpc3BsYXllZCBv biB0aGUgcGFnZSBjb3VsZCBiZSB0b2dnbGVkCisgICAgICAgIGluIGNhc2UgcGVvcGxlIG5lZWQg YWNjZXNzaWJpbGl0eSBjb2xvcnMgZGlzcGxheWVkIGluIHRoZWlyIGJyb3dzZXIuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU1NzAKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzIwOTk0NDY4PgorCisgICAgICAgIEFkZGVkIGluIENTUyBjb2xvcnMg YW5kIHRvZ2dsZSBidXR0b25zIGZvciBjaGVja21hcmtzIGluIHRoZSBwYWdlLCBzbyB0aGF0Cisg ICAgICAgIHRoZSBwYWdlIGNvdWxkIGJlIHJlbmRlcmVkIGluIGEgc3BlY2lmaWMgd2F5IGZvciBh Y2Nlc3NpYmlsaXR5IG5lZWRzIGlmIG5lZWRlZC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL01haW4uanM6CisgICAgICAg ICh1cGRhdGVIaWRkZW5QbGF0Zm9ybXMpOgorICAgICAgICAoYXBwbHlBY2Nlc3NpYmxlQ29sb3JT ZXR0aW5nKTogSW5pdGlhbCBsb2FkaW5nIG9mIGFjY2Vzc2liaWxpdHkgY29sb3JzIGlmIG5lY2Vz c2FyeQorICAgICAgICAodG9nZ2xlQWNjZXNzaWJpbGl0eUNvbG9ycyk6IENoYW5nZWQgbmFtZSB0 byBhZGQgcmVhZGFiaWxpdHkKKyAgICAgICAgKGRvY3VtZW50UmVhZHkpOgorICAgICAgICAqIEJ1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hi b2FyZC9TdHlsZXMvTWFpbi5jc3M6CisgICAgICAgIChhOmhvdmVyKToKKyAgICAgICAgKGRpdi5j ZWxsQnV0dG9uLCBkaXYuYWNjZXNzaWJpbGl0eUJ1dHRvbik6IEFkZGVkIGluIHNpbWlsYXIgcHJv cGVydGllcyBmb3IgY2VsbEJ1dHRvbiBhbmQgYWNjZXNzaWJpbGl0eUJ1dHRvbgorICAgICAgICAo ZGl2LmNlbGxCdXR0b24uaGlkZSwgZGl2LmFjY2Vzc2liaWxpdHlCdXR0b24uaGlkZSk6CisgICAg ICAgIChkaXYuY2VsbEJ1dHRvbi51bmhpZGUsIGRpdi5hY2Nlc3NpYmlsaXR5QnV0dG9uLnVuaGlk ZSk6CisgICAgICAgICguc2V0dGluZ3MtdmlzaWJsZSBkaXYuYWNjZXNzaWJpbGl0eUJ1dHRvbi5o aWRlLCAuc2V0dGluZ3MtdmlzaWJsZSBkaXYuYWNjZXNzaWJpbGl0eUJ1dHRvbi51bmhpZGUpOgor ICAgICAgICAoLnBvcG92ZXItdHJhY2tpbmc6aG92ZXIpOgorICAgICAgICAoLmFjY2Vzc2liaWxp dHlCdXR0b24pOgorICAgICAgICAoZGl2LmNlbGxCdXR0b24pOiBEZWxldGVkLgorICAgICAgICAo ZGl2LmNlbGxCdXR0b24uaGlkZSk6IERlbGV0ZWQuCisgICAgICAgIChkaXYuY2VsbEJ1dHRvbi51 bmhpZGUpOiBEZWxldGVkLgorICAgICAgICAoLnNldHRpbmdzLXZpc2libGUgZGl2LmNlbGxCdXR0 b24uaGlkZSwgLnNldHRpbmdzLXZpc2libGUgZGl2LmNlbGxCdXR0b24udW5oaWRlKTogRGVsZXRl ZC4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9w dWJsaWNfaHRtbC9kYXNoYm9hcmQvU3R5bGVzL1N0YXR1c0xpbmVWaWV3LmNzczogTmVlZGVkIHRv IGFkZCAKKyAgICAgICAgaW4gY2hhbmdlcyBzbyBjb2xvcnMgZXhpc3RlZCBpbiBtZW1vcnkKKyAg ICAgICAgKC5zdGF0dXMtbGluZS5uZXV0cmFsIC5idWJibGUpOgorICAgICAgICAoLnN0YXR1cy1s aW5lLnVuYXV0aG9yaXplZCAuYnViYmxlKToKKyAgICAgICAgKC5zdGF0dXMtbGluZS5kYW5nZXIg LmJ1YmJsZS5waWN0b2dyYW0pOgorICAgICAgICAoLnN0YXR1cy1saW5lLmJhZCAuYnViYmxlLnBp Y3RvZ3JhbSk6CisgICAgICAgICguc3RhdHVzLWxpbmUubm8tYnViYmxlIC5tZXNzYWdlKToKKyAg ICAgICAgKC5zdGF0dXMtbGluZS5iYWQgLmJ1YmJsZSk6CisgICAgICAgICguc3RhdHVzLWxpbmUu Z29vZCAuYnViYmxlKToKKyAgICAgICAgKC5zdGF0dXMtbGluZS5nb29kIC5tZXNzYWdlKToKKyAg ICAgICAgKC5zdGF0dXMtbGluZS5iYWQgLm1lc3NhZ2UpOgorICAgICAgICAoYm9keS5hY2Nlc3Np YmlsaXR5LWNvbG9ycyAuc3RhdHVzLWxpbmUuZ29vZCAuYnViYmxlKToKKyAgICAgICAgKGJvZHku YWNjZXNzaWJpbGl0eS1jb2xvcnMgLnN0YXR1cy1saW5lLmJhZCAuYnViYmxlKToKKyAgICAgICAg KGJvZHkuYWNjZXNzaWJpbGl0eS1jb2xvcnMgLnN0YXR1cy1saW5lLmdvb2QgLm1lc3NhZ2UpOgor ICAgICAgICAoYm9keS5hY2Nlc3NpYmlsaXR5LWNvbG9ycyAuc3RhdHVzLWxpbmUuYmFkIC5tZXNz YWdlKToKKyAgICAgICAgKC5zdGF0dXMtbGluZS5kYW5nZXIgLm1lc3NhZ2UpOgorICAgICAgICAo LnN0YXR1cy1saW5lLnVuYXV0aG9yaXplZCAubWVzc2FnZSk6CisKIDIwMTUtMDYtMDMgIERhbmll bCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYktpdDIuVGV4dEZpZWxk RGlkQmVnaW5BbmRFbmRFZGl0aW5nIGlzIGZsYWt5IG9uIE1hYwpJbmRleDogVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvTWFpbi5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9i dWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9NYWlu LmpzCShyZXZpc2lvbiAxODUxNzApCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9NYWluLmpzCSh3 b3JraW5nIGNvcHkpCkBAIC0xMzYsNiArMTM2LDMzIEBAIGZ1bmN0aW9uIHVwZGF0ZUhpZGRlblBs YXRmb3JtcygpCiAgICAgICAgIHVuaGlkZUJ1dHRvbi5jbGFzc0xpc3QuYWRkKCJoaWRkZW4iKTsK IH0KIAorZnVuY3Rpb24gYXBwbHlBY2Nlc3NpYmxlQ29sb3JTZXR0aW5nKCkKK3sKKyAgICB2YXIg dXNlQWNjZXNzaWJsZUNvbG9ycyA9IHNldHRpbmdzLmdldE9iamVjdCgiYWNjZXNzaWJpbGl0eUNv bG9yc0VuYWJsZWQiKTsKKyAgICB2YXIgdG9nZ2xlQWNjZXNzaWJpbGl0eUNvbG9yQnV0dG9uID0g ZG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgiZGl2LnVuaGlkZS5oaWRkZW4uYWNjZXNzaWJpbGl0 eUJ1dHRvbiIpWzBdOworICAgIGlmICh1c2VBY2Nlc3NpYmxlQ29sb3JzKSB7CisgICAgICAgIHRv Z2dsZUFjY2Vzc2liaWxpdHlDb2xvckJ1dHRvbi50ZXh0Q29udGVudCA9ICJkaXNhYmxlIGFjY2Vz c2liaWxpdHkgY29sb3JzIjsKKyAgICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QudG9nZ2xl KCJhY2Nlc3NpYmlsaXR5LWNvbG9ycyIpOworICAgIH0KKyAgICBlbHNlCisgICAgICAgIHRvZ2ds ZUFjY2Vzc2liaWxpdHlDb2xvckJ1dHRvbi50ZXh0Q29udGVudCA9ICJlbmFibGUgYWNjZXNzaWJp bGl0eSBjb2xvcnMiOworfQorCitmdW5jdGlvbiB0b2dnbGVBY2Nlc3NpYmlsaXR5Q29sb3JzKCkK K3sKKyAgICB2YXIgaXNDdXJyZW50bHlBY3RpdmF0ZWQgPSBzZXR0aW5ncy5nZXRPYmplY3QoImFj Y2Vzc2liaWxpdHlDb2xvcnNFbmFibGVkIik7CisgICAgaWYgKGlzQ3VycmVudGx5QWN0aXZhdGVk ID09PSB1bmRlZmluZWQpCisgICAgICAgIGlzQ3VycmVudGx5QWN0aXZhdGVkID0gZmFsc2U7Cisg ICAgCisgICAgc2V0dGluZ3Muc2V0T2JqZWN0KCJhY2Nlc3NpYmlsaXR5Q29sb3JzRW5hYmxlZCIs ICFpc0N1cnJlbnRseUFjdGl2YXRlZCk7CisgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QudG9n Z2xlKCJhY2Nlc3NpYmlsaXR5LWNvbG9ycyIpOworICAgIHZhciB0b2dnbGVBY2Nlc3NpYmlsaXR5 Q29sb3JCdXR0b24gPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCJkaXYudW5oaWRlLmhpZGRl bi5hY2Nlc3NpYmlsaXR5QnV0dG9uIilbMF07CisgICAgaWYgKCFpc0N1cnJlbnRseUFjdGl2YXRl ZCkKKyAgICAgICAgdG9nZ2xlQWNjZXNzaWJpbGl0eUNvbG9yQnV0dG9uLnRleHRDb250ZW50ID0g ImRpc2FibGUgYWNjZXNzaWJpbGl0eSBjb2xvcnMiOworICAgIGVsc2UKKyAgICAgICAgdG9nZ2xl QWNjZXNzaWJpbGl0eUNvbG9yQnV0dG9uLnRleHRDb250ZW50ID0gImVuYWJsZSBhY2Nlc3NpYmls aXR5IGNvbG9ycyI7Cit9CisKIGZ1bmN0aW9uIGRvY3VtZW50UmVhZHkoKQogewogICAgIHZhciB0 YWJsZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInRhYmxlIik7CkBAIC0xNDQsMTEgKzE3MSwx MiBAQCBmdW5jdGlvbiBkb2N1bWVudFJlYWR5KCkKICAgICB2YXIgcm93ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgidHIiKTsKICAgICByb3cuY2xhc3NMaXN0LmFkZCgiaGVhZGVycyIpOwogCi0g ICAgdmFyIGhlYWRlciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInRoIik7CiAgICAgdmFyIHVu aGlkZUJ1dHRvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgIHVuaGlkZUJ1 dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIGZ1bmN0aW9uICgpIHsgc2V0dGluZ3MuY2xl YXJIaWRkZW5QbGF0Zm9ybXMoKTsgfSk7CiAgICAgdW5oaWRlQnV0dG9uLnRleHRDb250ZW50ID0g IlNob3cgQWxsIFBsYXRmb3JtcyI7CiAgICAgdW5oaWRlQnV0dG9uLmNsYXNzTGlzdC5hZGQoImNl bGxCdXR0b24iLCAidW5oaWRlIiwgImhpZGRlbiIpOworCisgICAgdmFyIGhlYWRlciA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoInRoIik7IAogICAgIGhlYWRlci5hcHBlbmRDaGlsZCh1bmhpZGVC dXR0b24pOwogICAgIHJvdy5hcHBlbmRDaGlsZChoZWFkZXIpOwogCkBAIC0yNjAsNiArMjg4LDEz IEBAIGZ1bmN0aW9uIGRvY3VtZW50UmVhZHkoKQogICAgICAgICBzZXR0aW5nc0J1dHRvbi5jbGFz c0xpc3QuYWRkKCJzZXR0aW5ncyIpOwogICAgICAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxk KHNldHRpbmdzQnV0dG9uKTsKIAorICAgICAgICB2YXIgdG9nZ2xlQWNjZXNzaWJpbGl0eUNvbG9y QnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgIHRvZ2dsZUFj Y2Vzc2liaWxpdHlDb2xvckJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIGZ1bmN0aW9u KCkgeyB0b2dnbGVBY2Nlc3NpYmlsaXR5Q29sb3JzKCk7IH0pOworICAgICAgICB0b2dnbGVBY2Nl c3NpYmlsaXR5Q29sb3JCdXR0b24uc2V0QXR0cmlidXRlKCJjbGFzcyIsICJ1bmhpZGUgaGlkZGVu IGFjY2Vzc2liaWxpdHlCdXR0b24iKTsKKyAgICAgICAgdG9nZ2xlQWNjZXNzaWJpbGl0eUNvbG9y QnV0dG9uLnRleHRDb250ZW50ID0gImVuYWJsZSBhY2Nlc3NpYmlsaXR5IGNvbG9ycyI7CisgICAg ICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQodG9nZ2xlQWNjZXNzaWJpbGl0eUNvbG9yQnV0 dG9uKTsKKyAgICAgICAgYXBwbHlBY2Nlc3NpYmxlQ29sb3JTZXR0aW5nKCk7CisgICAgICAgIAog ICAgICAgICB1cGRhdGVIaWRkZW5QbGF0Zm9ybXMoKTsKICAgICAgICAgc2V0dGluZ3MuYWRkU2V0 dGluZ0xpc3RlbmVyKCJoaWRkZW5QbGF0Zm9ybXMiLCB1cGRhdGVIaWRkZW5QbGF0Zm9ybXMpOwog ICAgIH0KSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TdHlsZXMvTWFpbi5jc3MKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0 bWwvZGFzaGJvYXJkL1N0eWxlcy9NYWluLmNzcwkocmV2aXNpb24gMTg1MTcwKQorKysgVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFz aGJvYXJkL1N0eWxlcy9NYWluLmNzcwkod29ya2luZyBjb3B5KQpAQCAtNDIsMjUgKzQyLDI2IEBA IGE6aG92ZXIgewogICAgIHRleHQtZGVjb3JhdGlvbjogdW5kZXJsaW5lOwogfQogCi1kaXYuY2Vs bEJ1dHRvbiB7CitkaXYuY2VsbEJ1dHRvbiwgZGl2LmFjY2Vzc2liaWxpdHlCdXR0b24gewogICAg IGZvbnQtZmFtaWx5OiAiSGVsdmV0aWNhTmV1ZS1MaWdodCIsIHNhbnMtc2VyaWY7CiAgICAgZm9u dC1zaXplOiAxMnB4OwogICAgIGNvbG9yOiByZ2IoMTg1LCAxNzUsIDEyNSk7CiAgICAgY3Vyc29y OiBwb2ludGVyOwogfQogCi1kaXYuY2VsbEJ1dHRvbi5oaWRlIHsKK2Rpdi5jZWxsQnV0dG9uLmhp ZGUsIGRpdi5hY2Nlc3NpYmlsaXR5QnV0dG9uLmhpZGUgewogICAgIGRpc3BsYXk6IG5vbmU7CiAg ICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIGJvdHRvbTogMnB4OwogICAgIHJpZ2h0OiA0cHg7 CiB9CiAKLWRpdi5jZWxsQnV0dG9uLnVuaGlkZSB7CitkaXYuY2VsbEJ1dHRvbi51bmhpZGUsIGRp di5hY2Nlc3NpYmlsaXR5QnV0dG9uLnVuaGlkZSB7CiAgICAgZGlzcGxheTogbm9uZTsKIH0KIAot LnNldHRpbmdzLXZpc2libGUgZGl2LmNlbGxCdXR0b24uaGlkZSwgLnNldHRpbmdzLXZpc2libGUg ZGl2LmNlbGxCdXR0b24udW5oaWRlIHsKKy5zZXR0aW5ncy12aXNpYmxlIGRpdi5jZWxsQnV0dG9u LmhpZGUsIC5zZXR0aW5ncy12aXNpYmxlIGRpdi5jZWxsQnV0dG9uLnVuaGlkZSwKKy5zZXR0aW5n cy12aXNpYmxlIGRpdi5hY2Nlc3NpYmlsaXR5QnV0dG9uLmhpZGUsIC5zZXR0aW5ncy12aXNpYmxl IGRpdi5hY2Nlc3NpYmlsaXR5QnV0dG9uLnVuaGlkZSB7CiAgICAgZGlzcGxheTogYmxvY2s7CiB9 CiAKQEAgLTIwMCwzICsyMDEsOSBAQCB0YWJsZS5xdWV1ZS1ncmlkIHRyLnBsYXRmb3JtLmxpbnV4 LWVmbCBpCiAucG9wb3Zlci10cmFja2luZzpob3ZlciB7CiAgICAgdGV4dC1zaGFkb3c6IDBweCAw cHggM3B4IHJnYmEoMCwgMCwgMCwgMC4yKQogfQorCisuYWNjZXNzaWJpbGl0eUJ1dHRvbiB7Cisg ICAgcG9zaXRpb246IGFic29sdXRlOworICAgIGxlZnQ6IDQ1cHg7CisgICAgdG9wOiAxMy41cHg7 Cit9CkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU3R5bGVzL1N0YXR1c0xpbmVWaWV3LmNzcwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9w dWJsaWNfaHRtbC9kYXNoYm9hcmQvU3R5bGVzL1N0YXR1c0xpbmVWaWV3LmNzcwkocmV2aXNpb24g MTg1MTcwKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1N0eWxlcy9TdGF0dXNMaW5lVmlldy5jc3MJKHdvcmtp bmcgY29weSkKQEAgLTUwLDEwICs1MCw2IEBACiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDE4 MSwgMTc0LCAxNDgpOwogfQogCi0uc3RhdHVzLWxpbmUuZ29vZCAuYnViYmxlIHsKLSAgICBiYWNr Z3JvdW5kLWNvbG9yOiByZ2IoNTAsIDIxOSwgNzIpOwotfQotCiAuc3RhdHVzLWxpbmUudW5hdXRo b3JpemVkIC5idWJibGUgewogICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigxNzEsIDYxLCAxNzEp OwogfQpAQCAtODAsMTAgKzc2LDYgQEAKICAgICBmb250LXdlaWdodDogYm9sZDsKIH0KIAotLnN0 YXR1cy1saW5lLmJhZCAuYnViYmxlIHsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMTk2LCA0 OSwgNDkpOwotfQotCiAuc3RhdHVzLWxpbmUuYmFkIC5idWJibGUucGljdG9ncmFtIHsKICAgICBm b250LWZhbWlseTogIk1lbmxvLUJvbGQiLCBzYW5zLXNlcmlmOwogICAgIGZvbnQtc2l6ZTogMjNw eDsKQEAgLTEyOSwyMSArMTIxLDQ3IEBACiAgICAgY29sb3I6IHJnYigxNDUsIDEzNSwgOTUpOwog fQogCisuc3RhdHVzLWxpbmUuYmFkIC5idWJibGUgeworICAgIGJhY2tncm91bmQtY29sb3I6IHJn YigxOTEsIDY3LCA0MSk7Cit9CisKKy5zdGF0dXMtbGluZS5nb29kIC5idWJibGUgeworICAgIGJh Y2tncm91bmQtY29sb3I6IHJnYig3NiwgMTUxLCA2MSk7Cit9CisKIC5zdGF0dXMtbGluZS5nb29k IC5sYWJlbCwKIC5zdGF0dXMtbGluZS5nb29kIC5tZXNzYWdlIHsKKyAgICBjb2xvcjogcmdiKDc2 LCAxNTEsIDYxKTsKK30KKworLnN0YXR1cy1saW5lLmJhZCAubGFiZWwsCisuc3RhdHVzLWxpbmUu YmFkIC5tZXNzYWdlIHsKKyAgICBjb2xvcjogcmdiKDE5MSwgNjcsIDQxKTsKK30KKworYm9keS5h Y2Nlc3NpYmlsaXR5LWNvbG9ycyAuc3RhdHVzLWxpbmUuZ29vZCAuYnViYmxlIHsKKyAgICBiYWNr Z3JvdW5kLWNvbG9yOiByZ2IoNTAsIDIxOSwgNzIpOworfQorCitib2R5LmFjY2Vzc2liaWxpdHkt Y29sb3JzIC5zdGF0dXMtbGluZS5iYWQgLmJ1YmJsZSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjog cmdiKDE5NiwgNDksIDQ5KTsKK30KKworYm9keS5hY2Nlc3NpYmlsaXR5LWNvbG9ycyAuc3RhdHVz LWxpbmUuZ29vZCAubGFiZWwsCitib2R5LmFjY2Vzc2liaWxpdHktY29sb3JzIC5zdGF0dXMtbGlu ZS5nb29kIC5tZXNzYWdlIHsKICAgICBjb2xvcjogcmdiKDQwLCAxNzcsIDU4KTsKIH0KIAorYm9k eS5hY2Nlc3NpYmlsaXR5LWNvbG9ycyAuc3RhdHVzLWxpbmUuYmFkIC5sYWJlbCwKK2JvZHkuYWNj ZXNzaWJpbGl0eS1jb2xvcnMgLnN0YXR1cy1saW5lLmJhZCAubWVzc2FnZSB7CisgICAgY29sb3I6 IHJnYigxOTEsIDY3LCA0MSk7Cit9CisKIC5zdGF0dXMtbGluZS5kYW5nZXIgLmxhYmVsLAogLnN0 YXR1cy1saW5lLmRhbmdlciAubWVzc2FnZSB7CiAgICAgY29sb3I6IHJnYigyMzAsIDE3NSwgNDQp OwogfQogCi0uc3RhdHVzLWxpbmUuYmFkIC5sYWJlbCwKLS5zdGF0dXMtbGluZS5iYWQgLm1lc3Nh Z2UgewotICAgIGNvbG9yOiByZ2IoMTkxLCA2NywgNDEpOwotfQotCiAuc3RhdHVzLWxpbmUudW5h dXRob3JpemVkIC5sYWJlbCwKIC5zdGF0dXMtbGluZS51bmF1dGhvcml6ZWQgLm1lc3NhZ2Ugewog ICAgIGNvbG9yOiByZ2IoMTcxLCA2MSwgMTcxKTsK 254229 2015-06-03 18:28:09 -0700 2015-06-04 17:49:39 -0700 Patch bug-145570-20150603182755.patch text/plain 9320 mdaiter SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4NTE4MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDQ5IEBACisyMDE1LTA2LTAzICBNYXR0aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29t PgorCisgICAgICAgIEFkZGVkIGEgcGF0Y2ggc28gdGhhdCB0aGUgY29sb3JzIGRpc3BsYXllZCBv biB0aGUgcGFnZSBjb3VsZCBiZSB0b2dnbGVkCisgICAgICAgIGluIGNhc2UgcGVvcGxlIG5lZWQg YWNjZXNzaWJpbGl0eSBjb2xvcnMgZGlzcGxheWVkIGluIHRoZWlyIGJyb3dzZXIuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU1NzAKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzIwOTk0NDY4PgorCisgICAgICAgIEFkZGVkIGluIENTUyBjb2xvcnMg YW5kIHRvZ2dsZSBidXR0b25zIGZvciBjaGVja21hcmtzIGluIHRoZSBwYWdlLCBzbyB0aGF0Cisg ICAgICAgIHRoZSBwYWdlIGNvdWxkIGJlIHJlbmRlcmVkIGluIGEgc3BlY2lmaWMgd2F5IGZvciBh Y2Nlc3NpYmlsaXR5IG5lZWRzIGlmIG5lZWRlZC4KKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4 ZXkgUHJvc2t1cnlha292LgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Vi a2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvTWFpbi5qczoKKyAg ICAgICAgKHVwZGF0ZUhpZGRlblBsYXRmb3Jtcyk6CisgICAgICAgIChhcHBseUFjY2Vzc2liaWxp dHlDb2xvclNldHRpbmcpOiBJbml0aWFsIGxvYWRpbmcgb2YgYWNjZXNzaWJpbGl0eSBjb2xvcnMg aWYgbmVjZXNzYXJ5CisgICAgICAgICh0b2dnbGVBY2Nlc3NpYmlsaXR5Q29sb3JzKTogVG9nZ2xl IGNvbG9ycyBvbiBhbmQgb2ZmCisgICAgICAgIChkb2N1bWVudFJlYWR5KTogTmVlZGVkIHRvIG1h a2UgY2hhbmdlcyB0byB0aGUgaW5pdGlhbGl6YXRpb24KKyAgICAgICAgKiBCdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU3R5bGVz L01haW4uY3NzOgorICAgICAgICAoYTpob3Zlcik6CisgICAgICAgIChkaXYuY2VsbEJ1dHRvbiwg ZGl2LmFjY2Vzc2liaWxpdHlCdXR0b24pOiBBZGRlZCBpbiBzaW1pbGFyIHByb3BlcnRpZXMgZm9y IGNlbGxCdXR0b24gYW5kIGFjY2Vzc2liaWxpdHlCdXR0b24KKyAgICAgICAgKGRpdi5jZWxsQnV0 dG9uLmhpZGUsIGRpdi5hY2Nlc3NpYmlsaXR5QnV0dG9uLmhpZGUpOgorICAgICAgICAoZGl2LmNl bGxCdXR0b24udW5oaWRlLCBkaXYuYWNjZXNzaWJpbGl0eUJ1dHRvbi51bmhpZGUpOgorICAgICAg ICAoLnNldHRpbmdzLXZpc2libGUgZGl2LmFjY2Vzc2liaWxpdHlCdXR0b24uaGlkZSwgLnNldHRp bmdzLXZpc2libGUgZGl2LmFjY2Vzc2liaWxpdHlCdXR0b24udW5oaWRlKToKKyAgICAgICAgKC5w b3BvdmVyLXRyYWNraW5nOmhvdmVyKToKKyAgICAgICAgKC5hY2Nlc3NpYmlsaXR5QnV0dG9uKToK KyAgICAgICAgKGRpdi5jZWxsQnV0dG9uKTogRGVsZXRlZC4KKyAgICAgICAgKGRpdi5jZWxsQnV0 dG9uLmhpZGUpOiBEZWxldGVkLgorICAgICAgICAoZGl2LmNlbGxCdXR0b24udW5oaWRlKTogRGVs ZXRlZC4KKyAgICAgICAgKC5zZXR0aW5ncy12aXNpYmxlIGRpdi5jZWxsQnV0dG9uLmhpZGUsIC5z ZXR0aW5ncy12aXNpYmxlIGRpdi5jZWxsQnV0dG9uLnVuaGlkZSk6IERlbGV0ZWQuCisgICAgICAg ICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwv ZGFzaGJvYXJkL1N0eWxlcy9TdGF0dXNMaW5lVmlldy5jc3M6CisgICAgICAgICguc3RhdHVzLWxp bmUubmV1dHJhbCAuYnViYmxlKToKKyAgICAgICAgKC5zdGF0dXMtbGluZS51bmF1dGhvcml6ZWQg LmJ1YmJsZSk6CisgICAgICAgICguc3RhdHVzLWxpbmUuZGFuZ2VyIC5idWJibGUucGljdG9ncmFt KToKKyAgICAgICAgKC5zdGF0dXMtbGluZS5iYWQgLmJ1YmJsZS5waWN0b2dyYW0pOgorICAgICAg ICAoLnN0YXR1cy1saW5lLm5vLWJ1YmJsZSAubWVzc2FnZSk6CisgICAgICAgICguc3RhdHVzLWxp bmUuYmFkIC5idWJibGUpOgorICAgICAgICAoLnN0YXR1cy1saW5lLmdvb2QgLmJ1YmJsZSk6Cisg ICAgICAgICguc3RhdHVzLWxpbmUuZ29vZCAubWVzc2FnZSk6CisgICAgICAgICguc3RhdHVzLWxp bmUuYmFkIC5tZXNzYWdlKToKKyAgICAgICAgKGJvZHkuYWNjZXNzaWJpbGl0eS1jb2xvcnMgLnN0 YXR1cy1saW5lLmdvb2QgLmJ1YmJsZSk6CisgICAgICAgIChib2R5LmFjY2Vzc2liaWxpdHktY29s b3JzIC5zdGF0dXMtbGluZS5iYWQgLmJ1YmJsZSk6CisgICAgICAgIChib2R5LmFjY2Vzc2liaWxp dHktY29sb3JzIC5zdGF0dXMtbGluZS5nb29kIC5tZXNzYWdlKToKKyAgICAgICAgKGJvZHkuYWNj ZXNzaWJpbGl0eS1jb2xvcnMgLnN0YXR1cy1saW5lLmJhZCAubWVzc2FnZSk6CisgICAgICAgICgu c3RhdHVzLWxpbmUuZGFuZ2VyIC5tZXNzYWdlKToKKyAgICAgICAgKC5zdGF0dXMtbGluZS51bmF1 dGhvcml6ZWQgLm1lc3NhZ2UpOgorCiAyMDE1LTA2LTAzICBSeW9zdWtlIE5pd2EgIDxybml3YUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGZvciBEcm9tYWVvLgpJ bmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVi bGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvTWFpbi5qcwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9C dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNo Ym9hcmQvU2NyaXB0cy9NYWluLmpzCShyZXZpc2lvbiAxODUxODEpCisrKyBUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQv U2NyaXB0cy9NYWluLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xMzYsNiArMTM2LDMyIEBAIGZ1bmN0 aW9uIHVwZGF0ZUhpZGRlblBsYXRmb3JtcygpCiAgICAgICAgIHVuaGlkZUJ1dHRvbi5jbGFzc0xp c3QuYWRkKCJoaWRkZW4iKTsKIH0KIAorZnVuY3Rpb24gYXBwbHlBY2Nlc3NpYmlsaXR5Q29sb3JT ZXR0aW5nKCkKK3sKKyAgICB2YXIgdXNlQWNjZXNzaWJsZUNvbG9ycyA9IHNldHRpbmdzLmdldE9i amVjdCgiYWNjZXNzaWJpbGl0eUNvbG9yc0VuYWJsZWQiKTsKKyAgICB2YXIgdG9nZ2xlQWNjZXNz aWJpbGl0eUNvbG9yQnV0dG9uID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImFjY2Vzc2liaWxp dHlCdXR0b24iKTsKKyAgICBpZiAodXNlQWNjZXNzaWJsZUNvbG9ycykgeworICAgICAgICB0b2dn bGVBY2Nlc3NpYmlsaXR5Q29sb3JCdXR0b24udGV4dENvbnRlbnQgPSAiZGlzYWJsZSBhY2Nlc3Np YmlsaXR5IGNvbG9ycyI7CisgICAgICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LnRvZ2dsZSgi YWNjZXNzaWJpbGl0eS1jb2xvcnMiKTsKKyAgICB9IGVsc2UKKyAgICAgICAgdG9nZ2xlQWNjZXNz aWJpbGl0eUNvbG9yQnV0dG9uLnRleHRDb250ZW50ID0gImVuYWJsZSBhY2Nlc3NpYmlsaXR5IGNv bG9ycyI7Cit9CisKK2Z1bmN0aW9uIHRvZ2dsZUFjY2Vzc2liaWxpdHlDb2xvcnMoKQoreworICAg IHZhciBpc0N1cnJlbnRseUFjdGl2YXRlZCA9IHNldHRpbmdzLmdldE9iamVjdCgiYWNjZXNzaWJp bGl0eUNvbG9yc0VuYWJsZWQiKTsKKyAgICBpZiAoaXNDdXJyZW50bHlBY3RpdmF0ZWQgPT09IHVu ZGVmaW5lZCkKKyAgICAgICAgaXNDdXJyZW50bHlBY3RpdmF0ZWQgPSBmYWxzZTsKKyAgICAKKyAg ICBzZXR0aW5ncy5zZXRPYmplY3QoImFjY2Vzc2liaWxpdHlDb2xvcnNFbmFibGVkIiwgIWlzQ3Vy cmVudGx5QWN0aXZhdGVkKTsKKyAgICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC50b2dnbGUoImFj Y2Vzc2liaWxpdHktY29sb3JzIik7CisgICAgdmFyIHRvZ2dsZUFjY2Vzc2liaWxpdHlDb2xvckJ1 dHRvbiA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJhY2Nlc3NpYmlsaXR5QnV0dG9uIik7Cisg ICAgaWYgKCFpc0N1cnJlbnRseUFjdGl2YXRlZCkKKyAgICAgICAgdG9nZ2xlQWNjZXNzaWJpbGl0 eUNvbG9yQnV0dG9uLnRleHRDb250ZW50ID0gImRpc2FibGUgYWNjZXNzaWJpbGl0eSBjb2xvcnMi OworICAgIGVsc2UKKyAgICAgICAgdG9nZ2xlQWNjZXNzaWJpbGl0eUNvbG9yQnV0dG9uLnRleHRD b250ZW50ID0gImVuYWJsZSBhY2Nlc3NpYmlsaXR5IGNvbG9ycyI7Cit9CisKIGZ1bmN0aW9uIGRv Y3VtZW50UmVhZHkoKQogewogICAgIHZhciB0YWJsZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo InRhYmxlIik7CkBAIC0xNDQsMTEgKzE3MCwxMiBAQCBmdW5jdGlvbiBkb2N1bWVudFJlYWR5KCkK ICAgICB2YXIgcm93ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgidHIiKTsKICAgICByb3cuY2xh c3NMaXN0LmFkZCgiaGVhZGVycyIpOwogCi0gICAgdmFyIGhlYWRlciA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoInRoIik7CisgICAgdmFyIGhlYWRlciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo InRoIik7IAogICAgIHZhciB1bmhpZGVCdXR0b24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKTsKICAgICB1bmhpZGVCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCBmdW5jdGlv biAoKSB7IHNldHRpbmdzLmNsZWFySGlkZGVuUGxhdGZvcm1zKCk7IH0pOwogICAgIHVuaGlkZUJ1 dHRvbi50ZXh0Q29udGVudCA9ICJTaG93IEFsbCBQbGF0Zm9ybXMiOwogICAgIHVuaGlkZUJ1dHRv bi5jbGFzc0xpc3QuYWRkKCJjZWxsQnV0dG9uIiwgInVuaGlkZSIsICJoaWRkZW4iKTsKKwogICAg IGhlYWRlci5hcHBlbmRDaGlsZCh1bmhpZGVCdXR0b24pOwogICAgIHJvdy5hcHBlbmRDaGlsZCho ZWFkZXIpOwogCkBAIC0yNjAsNiArMjg3LDE0IEBAIGZ1bmN0aW9uIGRvY3VtZW50UmVhZHkoKQog ICAgICAgICBzZXR0aW5nc0J1dHRvbi5jbGFzc0xpc3QuYWRkKCJzZXR0aW5ncyIpOwogICAgICAg ICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKHNldHRpbmdzQnV0dG9uKTsKIAorICAgICAgICB2 YXIgdG9nZ2xlQWNjZXNzaWJpbGl0eUNvbG9yQnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7CisgICAgICAgIHRvZ2dsZUFjY2Vzc2liaWxpdHlDb2xvckJ1dHRvbi5hZGRFdmVu dExpc3RlbmVyKCJjbGljayIsIGZ1bmN0aW9uKCkgeyB0b2dnbGVBY2Nlc3NpYmlsaXR5Q29sb3Jz KCk7IH0pOworICAgICAgICB0b2dnbGVBY2Nlc3NpYmlsaXR5Q29sb3JCdXR0b24uc2V0QXR0cmli dXRlKCJjbGFzcyIsICJ1bmhpZGUgaGlkZGVuIGFjY2Vzc2liaWxpdHlCdXR0b24iKTsKKyAgICAg ICAgdG9nZ2xlQWNjZXNzaWJpbGl0eUNvbG9yQnV0dG9uLnNldEF0dHJpYnV0ZSgiaWQiLCAiYWNj ZXNzaWJpbGl0eUJ1dHRvbiIpOworICAgICAgICB0b2dnbGVBY2Nlc3NpYmlsaXR5Q29sb3JCdXR0 b24udGV4dENvbnRlbnQgPSAiZW5hYmxlIGFjY2Vzc2liaWxpdHkgY29sb3JzIjsKKyAgICAgICAg ZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZCh0b2dnbGVBY2Nlc3NpYmlsaXR5Q29sb3JCdXR0b24p OworICAgICAgICBhcHBseUFjY2Vzc2liaWxpdHlDb2xvclNldHRpbmcoKTsKKyAgICAgICAgCiAg ICAgICAgIHVwZGF0ZUhpZGRlblBsYXRmb3JtcygpOwogICAgICAgICBzZXR0aW5ncy5hZGRTZXR0 aW5nTGlzdGVuZXIoImhpZGRlblBsYXRmb3JtcyIsIHVwZGF0ZUhpZGRlblBsYXRmb3Jtcyk7CiAg ICAgfQpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1N0eWxlcy9NYWluLmNzcwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRt bC9kYXNoYm9hcmQvU3R5bGVzL01haW4uY3NzCShyZXZpc2lvbiAxODUxODEpCisrKyBUb29scy9C dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNo Ym9hcmQvU3R5bGVzL01haW4uY3NzCSh3b3JraW5nIGNvcHkpCkBAIC00MiwyNSArNDIsMjYgQEAg YTpob3ZlciB7CiAgICAgdGV4dC1kZWNvcmF0aW9uOiB1bmRlcmxpbmU7CiB9CiAKLWRpdi5jZWxs QnV0dG9uIHsKK2Rpdi5jZWxsQnV0dG9uLCBkaXYuYWNjZXNzaWJpbGl0eUJ1dHRvbiB7CiAgICAg Zm9udC1mYW1pbHk6ICJIZWx2ZXRpY2FOZXVlLUxpZ2h0Iiwgc2Fucy1zZXJpZjsKICAgICBmb250 LXNpemU6IDEycHg7CiAgICAgY29sb3I6IHJnYigxODUsIDE3NSwgMTI1KTsKICAgICBjdXJzb3I6 IHBvaW50ZXI7CiB9CiAKLWRpdi5jZWxsQnV0dG9uLmhpZGUgeworZGl2LmNlbGxCdXR0b24uaGlk ZSwgZGl2LmFjY2Vzc2liaWxpdHlCdXR0b24uaGlkZSB7CiAgICAgZGlzcGxheTogbm9uZTsKICAg ICBwb3NpdGlvbjogYWJzb2x1dGU7CiAgICAgYm90dG9tOiAycHg7CiAgICAgcmlnaHQ6IDRweDsK IH0KIAotZGl2LmNlbGxCdXR0b24udW5oaWRlIHsKK2Rpdi5jZWxsQnV0dG9uLnVuaGlkZSwgZGl2 LmFjY2Vzc2liaWxpdHlCdXR0b24udW5oaWRlIHsKICAgICBkaXNwbGF5OiBub25lOwogfQogCi0u c2V0dGluZ3MtdmlzaWJsZSBkaXYuY2VsbEJ1dHRvbi5oaWRlLCAuc2V0dGluZ3MtdmlzaWJsZSBk aXYuY2VsbEJ1dHRvbi51bmhpZGUgeworLnNldHRpbmdzLXZpc2libGUgZGl2LmNlbGxCdXR0b24u aGlkZSwgLnNldHRpbmdzLXZpc2libGUgZGl2LmNlbGxCdXR0b24udW5oaWRlLAorLnNldHRpbmdz LXZpc2libGUgZGl2LmFjY2Vzc2liaWxpdHlCdXR0b24uaGlkZSwgLnNldHRpbmdzLXZpc2libGUg ZGl2LmFjY2Vzc2liaWxpdHlCdXR0b24udW5oaWRlIHsKICAgICBkaXNwbGF5OiBibG9jazsKIH0K IApAQCAtMjAwLDMgKzIwMSw5IEBAIHRhYmxlLnF1ZXVlLWdyaWQgdHIucGxhdGZvcm0ubGludXgt ZWZsIGkKIC5wb3BvdmVyLXRyYWNraW5nOmhvdmVyIHsKICAgICB0ZXh0LXNoYWRvdzogMHB4IDBw eCAzcHggcmdiYSgwLCAwLCAwLCAwLjIpCiB9CisKKy5hY2Nlc3NpYmlsaXR5QnV0dG9uIHsKKyAg ICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgbGVmdDogNDVweDsKKyAgICB0b3A6IDEzLjVweDsK K30KSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L3B1YmxpY19odG1sL2Rhc2hib2FyZC9TdHlsZXMvU3RhdHVzTGluZVZpZXcuY3NzCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1 YmxpY19odG1sL2Rhc2hib2FyZC9TdHlsZXMvU3RhdHVzTGluZVZpZXcuY3NzCShyZXZpc2lvbiAx ODUxODEpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU3R5bGVzL1N0YXR1c0xpbmVWaWV3LmNzcwkod29ya2lu ZyBjb3B5KQpAQCAtNTAsMTAgKzUwLDYgQEAKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMTgx LCAxNzQsIDE0OCk7CiB9CiAKLS5zdGF0dXMtbGluZS5nb29kIC5idWJibGUgewotICAgIGJhY2tn cm91bmQtY29sb3I6IHJnYig1MCwgMjE5LCA3Mik7Ci19Ci0KIC5zdGF0dXMtbGluZS51bmF1dGhv cml6ZWQgLmJ1YmJsZSB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDE3MSwgNjEsIDE3MSk7 CiB9CkBAIC04MCwxMCArNzYsNiBAQAogICAgIGZvbnQtd2VpZ2h0OiBib2xkOwogfQogCi0uc3Rh dHVzLWxpbmUuYmFkIC5idWJibGUgewotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigxOTYsIDQ5 LCA0OSk7Ci19Ci0KIC5zdGF0dXMtbGluZS5iYWQgLmJ1YmJsZS5waWN0b2dyYW0gewogICAgIGZv bnQtZmFtaWx5OiAiTWVubG8tQm9sZCIsIHNhbnMtc2VyaWY7CiAgICAgZm9udC1zaXplOiAyM3B4 OwpAQCAtMTI5LDIxICsxMjEsNDcgQEAKICAgICBjb2xvcjogcmdiKDE0NSwgMTM1LCA5NSk7CiB9 CiAKKy5zdGF0dXMtbGluZS5iYWQgLmJ1YmJsZSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdi KDE5MSwgNjcsIDQxKTsKK30KKworLnN0YXR1cy1saW5lLmdvb2QgLmJ1YmJsZSB7CisgICAgYmFj a2dyb3VuZC1jb2xvcjogcmdiKDc2LCAxNTEsIDYxKTsKK30KKwogLnN0YXR1cy1saW5lLmdvb2Qg LmxhYmVsLAogLnN0YXR1cy1saW5lLmdvb2QgLm1lc3NhZ2UgeworICAgIGNvbG9yOiByZ2IoNzYs IDE1MSwgNjEpOworfQorCisuc3RhdHVzLWxpbmUuYmFkIC5sYWJlbCwKKy5zdGF0dXMtbGluZS5i YWQgLm1lc3NhZ2UgeworICAgIGNvbG9yOiByZ2IoMTkxLCA2NywgNDEpOworfQorCitib2R5LmFj Y2Vzc2liaWxpdHktY29sb3JzIC5zdGF0dXMtbGluZS5nb29kIC5idWJibGUgeworICAgIGJhY2tn cm91bmQtY29sb3I6IHJnYig1MCwgMjE5LCA3Mik7Cit9CisKK2JvZHkuYWNjZXNzaWJpbGl0eS1j b2xvcnMgLnN0YXR1cy1saW5lLmJhZCAuYnViYmxlIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBy Z2IoMTk2LCA0OSwgNDkpOworfQorCitib2R5LmFjY2Vzc2liaWxpdHktY29sb3JzIC5zdGF0dXMt bGluZS5nb29kIC5sYWJlbCwKK2JvZHkuYWNjZXNzaWJpbGl0eS1jb2xvcnMgLnN0YXR1cy1saW5l Lmdvb2QgLm1lc3NhZ2UgewogICAgIGNvbG9yOiByZ2IoNDAsIDE3NywgNTgpOwogfQogCitib2R5 LmFjY2Vzc2liaWxpdHktY29sb3JzIC5zdGF0dXMtbGluZS5iYWQgLmxhYmVsLAorYm9keS5hY2Nl c3NpYmlsaXR5LWNvbG9ycyAuc3RhdHVzLWxpbmUuYmFkIC5tZXNzYWdlIHsKKyAgICBjb2xvcjog cmdiKDE5MSwgNjcsIDQxKTsKK30KKwogLnN0YXR1cy1saW5lLmRhbmdlciAubGFiZWwsCiAuc3Rh dHVzLWxpbmUuZGFuZ2VyIC5tZXNzYWdlIHsKICAgICBjb2xvcjogcmdiKDIzMCwgMTc1LCA0NCk7 CiB9CiAKLS5zdGF0dXMtbGluZS5iYWQgLmxhYmVsLAotLnN0YXR1cy1saW5lLmJhZCAubWVzc2Fn ZSB7Ci0gICAgY29sb3I6IHJnYigxOTEsIDY3LCA0MSk7Ci19Ci0KIC5zdGF0dXMtbGluZS51bmF1 dGhvcml6ZWQgLmxhYmVsLAogLnN0YXR1cy1saW5lLnVuYXV0aG9yaXplZCAubWVzc2FnZSB7CiAg ICAgY29sb3I6IHJnYigxNzEsIDYxLCAxNzEpOwo= 254322 2015-06-04 17:49:45 -0700 2015-06-04 18:09:54 -0700 Patch bug-145570-20150604174932.patch text/plain 1342 mdaiter SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4NTIyOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE1LTA2LTA0ICBNYXR0aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29t PgorCisKKyAgICAgICAgTWFraW5nIHN1cmUgdGhhdCB0aGUgcG9zaXRpb24gb2YgYWNjZXNzaWJp bGl0aWVzIGJ1dHRvbiBpcyBmaXhlZCwgc28KKyAgICAgICAgaXQgc2Nyb2xscyB3aXRoIHRoZSBw YWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU1 NzAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIwOTk0NDY4PgorICAgICAgICAKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9y dC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU3R5bGVzL01h aW4uY3NzOgorICAgICAgICAoLnBvcG92ZXItdHJhY2tpbmc6aG92ZXIpOgorICAgICAgICAoLmFj Y2Vzc2liaWxpdHlCdXR0b24pOiBTaG91bGQgYmUgZml4ZWQsIG5vdCBhYnNvbHV0ZQorCiAyMDE1 LTA2LTA0ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFdl YktpdFRlc3RSdW5uZXIgbGVha3Mgc3RyaW5ncyBpbiBnZW5lcmF0ZVdoaXRlbGlzdCgpCkluZGV4 OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNf aHRtbC9kYXNoYm9hcmQvU3R5bGVzL01haW4uY3NzCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2Fy ZC9TdHlsZXMvTWFpbi5jc3MJKHJldmlzaW9uIDE4NTIyOCkKKysrIFRvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TdHls ZXMvTWFpbi5jc3MJKHdvcmtpbmcgY29weSkKQEAgLTIwMyw3ICsyMDMsNyBAQCB0YWJsZS5xdWV1 ZS1ncmlkIHRyLnBsYXRmb3JtLmxpbnV4LWVmbCBpCiB9CiAKIC5hY2Nlc3NpYmlsaXR5QnV0dG9u IHsKLSAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgcG9zaXRpb246IGZpeGVkOwogICAgIGxl ZnQ6IDQ1cHg7CiAgICAgdG9wOiAxMy41cHg7CiB9Cg==