147794 2015-08-07 14:20:45 -0700 Web Inspector: Simplify OS-specific CSS class names 2015-08-07 16:25:59 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 nvasilyev nvasilyev bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1115877 0 nvasilyev 2015-08-07 14:20:45 -0700 We currently have 2 versions in our CSS: — body:not(.el-capitan) for OS X <10.11 — body.el-capitan for OS X 10.11 There is a problem that 10.12, or anything >10.11 for that matter, currently gets "unknown-mac" class and falls into body:not(.el-capitan) selector. We don't want that; we want 10.12 to have El Capitan styles until we introduce a new version. WebInspector.Platform.version.name is currently used to add a corresponding class name to <body>. We should do this instead: if (WebInspector.Platform.version.release <= 10) document.body.classList.add("legacy-mac"); else if (WebInspector.Platform.version.release >= 11) document.body.classList.add("latest-mac"); CSS selectors: — body.legacy-mac — body.latest-mac It will eliminate the need for :not() selector. Later, when we need to have a new (third) UI version, we will: — Keep .legacy-mac CSS rules unchanged — Rename all .latest-mac to .el-capipan — Write all new rules under .latest-mac prefix via https://bugs.webkit.org/show_bug.cgi?id=147524#c8 1115890 1 258531 nvasilyev 2015-08-07 14:50:25 -0700 Created attachment 258531 Patch 1115895 2 258531 timothy 2015-08-07 15:01:57 -0700 Comment on attachment 258531 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258531&action=review > Source/WebInspectorUI/ChangeLog:28 > + We currently have 2 versions in our CSS: > + - body:not(.el-capitan) for OS X <10.11 > + - body.el-capitan for OS X 10.11 > + > + There is a problem that 10.12 (or >10.11, to be exact) currently gets > + "unknown-mac" class and falls into body:not(.el-capitan) selector. We don't want > + that; we want 10.12 to have El Capitan styles until we introduce a new version. > + > + WebInspector.Platform.version.name is currently used to add a corresponding class > + name to <body>. Instead we should use: > + > + - .legacy-mac for OS X <10.11 > + - .latest-mac for OS X >=10.11 > + > + It will eliminate the need for :not() selector. > + > + Later, when we need to have a new (third) UI version, we will: > + - Keep .legacy-mac CSS rules unchanged > + - Rename all .latest-mac to .el-capitan > + - Write all new rules under .latest-mac prefix Lets drop this. 1115903 3 258535 nvasilyev 2015-08-07 15:29:34 -0700 Created attachment 258535 Patch 1115904 4 258536 nvasilyev 2015-08-07 15:30:24 -0700 Created attachment 258536 Patch 1115922 5 258536 commit-queue 2015-08-07 16:25:54 -0700 Comment on attachment 258536 Patch Clearing flags on attachment: 258536 Committed r188173: <http://trac.webkit.org/changeset/188173> 1115923 6 commit-queue 2015-08-07 16:25:59 -0700 All reviewed patches have been landed. Closing bug. 258531 2015-08-07 14:50:25 -0700 2015-08-07 15:29:34 -0700 Patch patch.txt text/plain 9286 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDlhMjc1MTUuLjkyODYwNzkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU5IEBACisyMDE1LTA4LTA3ICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNpbXBs aWZ5IE9TLXNwZWNpZmljIENTUyBjbGFzcyBuYW1lcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3Nzk0CisKKyAgICAgICAgUmVwbGFjZSAiYm9keTpu b3QoLmVsLWNhcGl0YW4pIiB3aXRoICIubGVnYWN5LW1hYyIuCisgICAgICAgIFJlcGxhY2UgImJv ZHkuZWwtY2FwaXRhbiIgd2l0aCAiLmxhdGVzdC1tYWMiLgorCisgICAgICAgIFdlIGN1cnJlbnRs eSBoYXZlIDIgdmVyc2lvbnMgaW4gb3VyIENTUzoKKyAgICAgICAgLSBib2R5Om5vdCguZWwtY2Fw aXRhbikgZm9yIE9TIFggPDEwLjExCisgICAgICAgIC0gYm9keS5lbC1jYXBpdGFuIGZvciBPUyBY IDEwLjExCisKKyAgICAgICAgVGhlcmUgaXMgYSBwcm9ibGVtIHRoYXQgMTAuMTIgKG9yID4xMC4x MSwgdG8gYmUgZXhhY3QpIGN1cnJlbnRseSBnZXRzCisgICAgICAgICJ1bmtub3duLW1hYyIgY2xh c3MgYW5kIGZhbGxzIGludG8gYm9keTpub3QoLmVsLWNhcGl0YW4pIHNlbGVjdG9yLiBXZSBkb24n dCB3YW50IAorICAgICAgICB0aGF0OyB3ZSB3YW50IDEwLjEyIHRvIGhhdmUgRWwgQ2FwaXRhbiBz dHlsZXMgdW50aWwgd2UgaW50cm9kdWNlIGEgbmV3IHZlcnNpb24uCisKKyAgICAgICAgV2ViSW5z cGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ubmFtZSBpcyBjdXJyZW50bHkgdXNlZCB0byBhZGQgYSBj b3JyZXNwb25kaW5nIGNsYXNzCisgICAgICAgIG5hbWUgdG8gPGJvZHk+LiBJbnN0ZWFkIHdlIHNo b3VsZCB1c2U6CisKKyAgICAgICAgLSAubGVnYWN5LW1hYyBmb3IgT1MgWCA8MTAuMTEKKyAgICAg ICAgLSAubGF0ZXN0LW1hYyBmb3IgT1MgWCA+PTEwLjExCisKKyAgICAgICAgSXQgd2lsbCBlbGlt aW5hdGUgdGhlIG5lZWQgZm9yIDpub3QoKSBzZWxlY3Rvci4KKworICAgICAgICBMYXRlciwgd2hl biB3ZSBuZWVkIHRvIGhhdmUgYSBuZXcgKHRoaXJkKSBVSSB2ZXJzaW9uLCB3ZSB3aWxsOgorICAg ICAgICAtIEtlZXAgLmxlZ2FjeS1tYWMgQ1NTIHJ1bGVzIHVuY2hhbmdlZAorICAgICAgICAtIFJl bmFtZSBhbGwgLmxhdGVzdC1tYWMgdG8gLmVsLWNhcGl0YW4KKyAgICAgICAgLSBXcml0ZSBhbGwg bmV3IHJ1bGVzIHVuZGVyIC5sYXRlc3QtbWFjIHByZWZpeAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuY29udGVudExvYWRlZCk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9Ub29sYmFyLmNzczoKKyAgICAgICAgKGJvZHkubGVnYWN5LW1hYyAudG9v bGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lcik6CisgICAgICAgIChib2R5LmxlZ2FjeS1tYWMgLnRv b2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSk6CisgICAgICAgIChib2R5 LmxlZ2FjeS1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTpm b2N1cyk6CisgICAgICAgIChib2R5LmxlZ2FjeS1tYWMgLnRvb2xiYXIgLml0ZW0uYnV0dG9uOmFj dGl2ZSk6CisgICAgICAgIChib2R5LndpbmRvdy1pbmFjdGl2ZS5sZWdhY3ktbWFjIC50b29sYmFy IC5kYXNoYm9hcmQtY29udGFpbmVyKToKKyAgICAgICAgKGJvZHkubGF0ZXN0LW1hYyAudG9vbGJh ciAuZGFzaGJvYXJkLWNvbnRhaW5lcik6CisgICAgICAgIChib2R5LmxhdGVzdC1tYWMgLnRvb2xi YXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSk6CisgICAgICAgIChib2R5Lmxh dGVzdC1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTpmb2N1 cyk6CisgICAgICAgIChAbWVkaWEgKC13ZWJraXQtbWluLWRldmljZS1waXhlbC1yYXRpbzogMikp OgorICAgICAgICAoYm9keS5sYXRlc3QtbWFjIC50b29sYmFyIC5pdGVtLmJ1dHRvbjphY3RpdmUp OgorICAgICAgICAoYm9keS5sYXRlc3QtbWFjLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFz aGJvYXJkLWNvbnRhaW5lcik6CisgICAgICAgIChib2R5Om5vdCguZWwtY2FwaXRhbikgLnRvb2xi YXIgLmRhc2hib2FyZC1jb250YWluZXIpOiBEZWxldGVkLgorICAgICAgICAoYm9keTpub3QoLmVs LWNhcGl0YW4pIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0pOiBE ZWxldGVkLgorICAgICAgICAoYm9keTpub3QoLmVsLWNhcGl0YW4pIC50b29sYmFyIC5zZWFyY2gt YmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Zm9jdXMpOiBEZWxldGVkLgorICAgICAgICAoYm9k eTpub3QoLmVsLWNhcGl0YW4pIC50b29sYmFyIC5pdGVtLmJ1dHRvbjphY3RpdmUpOiBEZWxldGVk LgorICAgICAgICAoYm9keS53aW5kb3ctaW5hY3RpdmU6bm90KC5lbC1jYXBpdGFuKSAudG9vbGJh ciAuZGFzaGJvYXJkLWNvbnRhaW5lcik6IERlbGV0ZWQuCisgICAgICAgIChib2R5LmVsLWNhcGl0 YW4gLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIpOiBEZWxldGVkLgorICAgICAgICAoYm9k eS5lbC1jYXBpdGFuIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0p OiBEZWxldGVkLgorICAgICAgICAoYm9keS5lbC1jYXBpdGFuIC50b29sYmFyIC5zZWFyY2gtYmFy ID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Zm9jdXMpOiBEZWxldGVkLgorICAgICAgICAoYm9keS5l bC1jYXBpdGFuIC50b29sYmFyIC5pdGVtLmJ1dHRvbjphY3RpdmUpOiBEZWxldGVkLgorICAgICAg ICAoYm9keS5lbC1jYXBpdGFuLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNv bnRhaW5lcik6IERlbGV0ZWQuCisKIDIwMTUtMDgtMDcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29A YXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE9wdGlvbitVcC9Eb3duIGFycm93 IGtleXMgc2hvdWxkIGluY3JlbWVudC9kZWNyZW1lbnQgbnVtYmVycyBpbiBIVE1MIGFuZCBTVkcg YXR0cmlidXRlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFz ZS9NYWluLmpzCmluZGV4IGI4YzczNmIuLjFmNTZiMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKQEAgLTE5MCw4ICsxOTAsMTMgQEAg V2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQgPSBmdW5jdGlvbigpCiAgICAgZG9jdW1lbnQuYm9k eS5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5uYW1lICsgIi1wbGF0Zm9ybSIp OwogICAgIGlmIChXZWJJbnNwZWN0b3IuUGxhdGZvcm0uaXNOaWdodGx5QnVpbGQpCiAgICAgICAg IGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZCgibmlnaHRseS1idWlsZCIpOwotICAgIGlmIChX ZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5uYW1lKQotICAgICAgICBkb2N1bWVudC5ib2R5 LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ubmFtZSk7CisKKyAg ICBpZiAoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLm5hbWUgPT09ICJtYWMiKSB7CisgICAgICAgIGlm IChXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNlID49IDExKQorICAgICAgICAg ICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKCJsYXRlc3QtbWFjIik7CisgICAgICAgIGVs c2UKKyAgICAgICAgICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZCgibGVnYWN5LW1hYyIp OworICAgIH0KIAogICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZCh0aGlzLmRlYnVnZ2Fi bGVUeXBlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVG9vbGJhci5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Ub29sYmFyLmNzcwppbmRleCAxOGZiNWI0Li43MGE5NzU1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Ub29sYmFyLmNzcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Ub29sYmFyLmNzcwpA QCAtMTE0LDkgKzExNCw5IEBAIGJvZHkubWFjLXBsYXRmb3JtOm5vdCguZG9ja2VkKSAudG9vbGJh ciB7CiAgICAgbWFyZ2luLWxlZnQ6IDRweDsKIH0KIAotYm9keTpub3QoLmVsLWNhcGl0YW4pIC50 b29sYmFyIC5pdGVtLmJ1dHRvbiwKLWJvZHk6bm90KC5lbC1jYXBpdGFuKSAudG9vbGJhciAuc2Vh cmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdLAotYm9keTpub3QoLmVsLWNhcGl0YW4pIC50 b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKK2JvZHkubGVnYWN5LW1hYyAudG9vbGJhciAu aXRlbS5idXR0b24sCitib2R5LmxlZ2FjeS1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1 dFt0eXBlPSJzZWFyY2giXSwKK2JvZHkubGVnYWN5LW1hYyAudG9vbGJhciAuZGFzaGJvYXJkLWNv bnRhaW5lciB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDAsIDAlLCA5OSUpOwogICAgIGJv cmRlcjogMXB4IHNvbGlkIHRyYW5zcGFyZW50OwogICAgIGJvcmRlci10b3AtY29sb3I6IGhzbCgw LCAwJSwgMTAwJSk7CkBAIC0xMjQsMzEgKzEyNCwzMSBAQCBib2R5Om5vdCguZWwtY2FwaXRhbikg LnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIgewogICAgIGJvcmRlci1yYWRpdXM6IDRweDsK IH0KIAotYm9keTpub3QoLmVsLWNhcGl0YW4pIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRb dHlwZT0ic2VhcmNoIl0geworYm9keS5sZWdhY3ktbWFjIC50b29sYmFyIC5zZWFyY2gtYmFyID4g aW5wdXRbdHlwZT0ic2VhcmNoIl0gewogICAgIGJveC1zaGFkb3c6IDAgMCAwIDdweCBoc2xhKDIx MSwgOTYlLCA0OCUsIDApOwogICAgIHRyYW5zaXRpb246IGJveC1zaGFkb3cgLjI1cyBjdWJpYy1i ZXppZXIoMC4xNjUsIDAuODQwLCAwLjQ0MCwgMSkgLyogZWFzZU91dFF1YXJ0ICovOwogfQogCi1i b2R5Om5vdCguZWwtY2FwaXRhbikgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJz ZWFyY2giXTpmb2N1cyB7Citib2R5LmxlZ2FjeS1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBp bnB1dFt0eXBlPSJzZWFyY2giXTpmb2N1cyB7CiAgICAgYm94LXNoYWRvdzogaHNsYSgwLCAwJSwg MCUsIDAuMTUpIDAgMXB4IDAsIDAgMCAwIDNweCBoc2xhKDIxMSwgOTYlLCA0OCUsIDAuNCk7CiB9 CiAKLWJvZHk6bm90KC5lbC1jYXBpdGFuKSAudG9vbGJhciAuaXRlbS5idXR0b246YWN0aXZlIHsK K2JvZHkubGVnYWN5LW1hYyAudG9vbGJhciAuaXRlbS5idXR0b246YWN0aXZlIHsKICAgICBib3Jk ZXItdG9wLWNvbG9yOiBoc2woMCwgMCUsIDk0JSk7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNs KDAsIDAlLCA4OSUpOwogfQogCi1ib2R5LndpbmRvdy1pbmFjdGl2ZTpub3QoLmVsLWNhcGl0YW4p IC50b29sYmFyIC5pdGVtLmJ1dHRvbiwKLWJvZHkud2luZG93LWluYWN0aXZlOm5vdCguZWwtY2Fw aXRhbikgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSwKLWJvZHku d2luZG93LWluYWN0aXZlOm5vdCguZWwtY2FwaXRhbikgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250 YWluZXIgeworYm9keS53aW5kb3ctaW5hY3RpdmUubGVnYWN5LW1hYyAudG9vbGJhciAuaXRlbS5i dXR0b24sCitib2R5LndpbmRvdy1pbmFjdGl2ZS5sZWdhY3ktbWFjIC50b29sYmFyIC5zZWFyY2gt YmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0sCitib2R5LndpbmRvdy1pbmFjdGl2ZS5sZWdhY3kt bWFjIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKICAgICBib3JkZXI6IDFweCBzb2xp ZCBoc2woMCwgMCUsIDg2JSk7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDAsIDAlLCA5NiUp OwogICAgIGJveC1zaGFkb3c6IG5vbmU7CiB9CiAKLWJvZHkuZWwtY2FwaXRhbiAudG9vbGJhciAu aXRlbS5idXR0b24sCi1ib2R5LmVsLWNhcGl0YW4gLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1 dFt0eXBlPSJzZWFyY2giXSwKLWJvZHkuZWwtY2FwaXRhbiAudG9vbGJhciAuZGFzaGJvYXJkLWNv bnRhaW5lciB7Citib2R5LmxhdGVzdC1tYWMgLnRvb2xiYXIgLml0ZW0uYnV0dG9uLAorYm9keS5s YXRlc3QtbWFjIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0sCiti b2R5LmxhdGVzdC1tYWMgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIgewogICAgIGJhY2tn cm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudChoc2woMCwgMCUsIDk5JSksIGhzbCgwLCAwJSwg OTQlKSk7CiAgICAgYm94LXNoYWRvdzogaHNsYSgwLCAwJSwgMCUsIDAuMykgMCAxcHggMXB4IC0x cHg7CiAKQEAgLTE1OCwzMyArMTU4LDMzIEBAIGJvZHkuZWwtY2FwaXRhbiAudG9vbGJhciAuZGFz aGJvYXJkLWNvbnRhaW5lciB7CiAgICAgYm9yZGVyLWJvdHRvbS1jb2xvcjogaHNsKDAsIDAlLCA3 NiUpOwogfQogCi1ib2R5LmVsLWNhcGl0YW4gLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0 eXBlPSJzZWFyY2giXSB7Citib2R5LmxhdGVzdC1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBp bnB1dFt0eXBlPSJzZWFyY2giXSB7CiAgICAgYm94LXNoYWRvdzogaHNsYSgwLCAwJSwgMCUsIDAu MykgMCAxcHggMXB4IC0xcHgsIDAgMCAwIDdweCBoc2xhKDIxMSwgOTYlLCA0OCUsIDApOwogICAg IHRyYW5zaXRpb246IGJveC1zaGFkb3cgLjI1cyBjdWJpYy1iZXppZXIoMC4xNjUsIDAuODQwLCAw LjQ0MCwgMSkgLyogZWFzZU91dFF1YXJ0ICovOwogfQogCi1ib2R5LmVsLWNhcGl0YW4gLnRvb2xi YXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTpmb2N1cyB7Citib2R5LmxhdGVz dC1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTpmb2N1cyB7 CiAgICAgYm94LXNoYWRvdzogaHNsYSgwLCAwJSwgMCUsIDAuMTUpIDAgMXB4IDAsIDAgMCAwIDNw eCBoc2xhKDIxMSwgOTYlLCA0OCUsIDAuNCk7CiB9CiAKIEBtZWRpYSAoLXdlYmtpdC1taW4tZGV2 aWNlLXBpeGVsLXJhdGlvOiAyKSB7Ci0gICAgYm9keS5lbC1jYXBpdGFuIC50b29sYmFyIC5pdGVt LmJ1dHRvbiwKLSAgICBib2R5LmVsLWNhcGl0YW4gLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1 dFt0eXBlPSJzZWFyY2giXSwKLSAgICBib2R5LmVsLWNhcGl0YW4gLnRvb2xiYXIgLmRhc2hib2Fy ZC1jb250YWluZXIgeworICAgIGJvZHkubGF0ZXN0LW1hYyAudG9vbGJhciAuaXRlbS5idXR0b24s CisgICAgYm9keS5sYXRlc3QtbWFjIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0i c2VhcmNoIl0sCisgICAgYm9keS5sYXRlc3QtbWFjIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFp bmVyIHsKICAgICAgICAgYm9yZGVyOiAwLjVweCBzb2xpZCBoc2woMCwgMCUsIDc4JSk7CiAgICAg ICAgIGJvcmRlci10b3AtY29sb3I6IGhzbCgwLCAwJSwgODAlKTsKICAgICAgICAgYm9yZGVyLWJv dHRvbS1jb2xvcjogaHNsKDAsIDAlLCA2NSUpOwogICAgIH0KIH0KIAotYm9keS5lbC1jYXBpdGFu IC50b29sYmFyIC5pdGVtLmJ1dHRvbjphY3RpdmUgeworYm9keS5sYXRlc3QtbWFjIC50b29sYmFy IC5pdGVtLmJ1dHRvbjphY3RpdmUgewogICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFk aWVudChoc2woMCwgMCUsIDg5JSksIGhzbCgwLCAwJSwgODYlKSk7CiAgICAgYm94LXNoYWRvdzog aHNsYSgwLCAwJSwgMCUsIDAuMykgMCAxcHggMXB4IC0xcHgsIGluc2V0IDAgMXB4IDFweCAtMXB4 IHdoaXRlOwogfQogCi1ib2R5LmVsLWNhcGl0YW4ud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5p dGVtLmJ1dHRvbiwKLWJvZHkuZWwtY2FwaXRhbi53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLnNl YXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSwKLWJvZHkuZWwtY2FwaXRhbi53aW5kb3ct aW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIgeworYm9keS5sYXRlc3QtbWFj LndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuaXRlbS5idXR0b24sCitib2R5LmxhdGVzdC1tYWMu d2luZG93LWluYWN0aXZlIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNo Il0sCitib2R5LmxhdGVzdC1tYWMud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5kYXNoYm9hcmQt Y29udGFpbmVyIHsKICAgICBvcGFjaXR5OiAwLjY1OwogICAgIGJvcmRlci1jb2xvcjogaHNsYSgw LCAwJSwgMCUsIDAuMTUpOwogICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50OwpAQCAt MTkyLDkgKzE5Miw5IEBAIGJvZHkuZWwtY2FwaXRhbi53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIg LmRhc2hib2FyZC1jb250YWluZXIgewogfQogCiBAbWVkaWEgKC13ZWJraXQtbWluLWRldmljZS1w aXhlbC1yYXRpbzogMikgewotICAgIGJvZHkuZWwtY2FwaXRhbi53aW5kb3ctaW5hY3RpdmUgLnRv b2xiYXIgLml0ZW0uYnV0dG9uLAotICAgIGJvZHkuZWwtY2FwaXRhbi53aW5kb3ctaW5hY3RpdmUg LnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSwKLSAgICBib2R5LmVs LWNhcGl0YW4ud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsK KyAgICBib2R5LmxhdGVzdC1tYWMud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5pdGVtLmJ1dHRv biwKKyAgICBib2R5LmxhdGVzdC1tYWMud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5zZWFyY2gt YmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0sCisgICAgYm9keS5sYXRlc3QtbWFjLndpbmRvdy1p bmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CiAgICAgICAgIGJveC1zaGFk b3c6IGluc2V0IDAgMCAxcHggMCBoc2xhKDAsIDAlLCAwJSwgMC4xKTsKICAgICB9CiB9Cg== 258535 2015-08-07 15:29:34 -0700 2015-08-07 15:30:24 -0700 Patch patch.txt text/plain 8374 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDlhMjc1MTUuLmQxYWE0NTMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE1LTA4LTA3ICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNpbXBs aWZ5IE9TLXNwZWNpZmljIENTUyBjbGFzcyBuYW1lcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3Nzk0CisKKyAgICAgICAgUmVwbGFjZSAiYm9keTpu b3QoLmVsLWNhcGl0YW4pIiB3aXRoICIubGVnYWN5LW1hYyIuCisgICAgICAgIFJlcGxhY2UgImJv ZHkuZWwtY2FwaXRhbiIgd2l0aCAiLmxhdGVzdC1tYWMiLgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuY29udGVudExvYWRlZCk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9Ub29sYmFyLmNzczoKKyAgICAgICAgKGJvZHkubGVnYWN5LW1hYyAudG9v bGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lcik6CisgICAgICAgIChib2R5LmxlZ2FjeS1tYWMgLnRv b2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSk6CisgICAgICAgIChib2R5 LmxlZ2FjeS1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTpm b2N1cyk6CisgICAgICAgIChib2R5LmxlZ2FjeS1tYWMgLnRvb2xiYXIgLml0ZW0uYnV0dG9uOmFj dGl2ZSk6CisgICAgICAgIChib2R5LndpbmRvdy1pbmFjdGl2ZS5sZWdhY3ktbWFjIC50b29sYmFy IC5kYXNoYm9hcmQtY29udGFpbmVyKToKKyAgICAgICAgKGJvZHkubGF0ZXN0LW1hYyAudG9vbGJh ciAuZGFzaGJvYXJkLWNvbnRhaW5lcik6CisgICAgICAgIChib2R5LmxhdGVzdC1tYWMgLnRvb2xi YXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSk6CisgICAgICAgIChib2R5Lmxh dGVzdC1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTpmb2N1 cyk6CisgICAgICAgIChAbWVkaWEgKC13ZWJraXQtbWluLWRldmljZS1waXhlbC1yYXRpbzogMikp OgorICAgICAgICAoYm9keS5sYXRlc3QtbWFjIC50b29sYmFyIC5pdGVtLmJ1dHRvbjphY3RpdmUp OgorICAgICAgICAoYm9keS5sYXRlc3QtbWFjLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFz aGJvYXJkLWNvbnRhaW5lcik6CisgICAgICAgIChib2R5Om5vdCguZWwtY2FwaXRhbikgLnRvb2xi YXIgLmRhc2hib2FyZC1jb250YWluZXIpOiBEZWxldGVkLgorICAgICAgICAoYm9keTpub3QoLmVs LWNhcGl0YW4pIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0pOiBE ZWxldGVkLgorICAgICAgICAoYm9keTpub3QoLmVsLWNhcGl0YW4pIC50b29sYmFyIC5zZWFyY2gt YmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Zm9jdXMpOiBEZWxldGVkLgorICAgICAgICAoYm9k eTpub3QoLmVsLWNhcGl0YW4pIC50b29sYmFyIC5pdGVtLmJ1dHRvbjphY3RpdmUpOiBEZWxldGVk LgorICAgICAgICAoYm9keS53aW5kb3ctaW5hY3RpdmU6bm90KC5lbC1jYXBpdGFuKSAudG9vbGJh ciAuZGFzaGJvYXJkLWNvbnRhaW5lcik6IERlbGV0ZWQuCisgICAgICAgIChib2R5LmVsLWNhcGl0 YW4gLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIpOiBEZWxldGVkLgorICAgICAgICAoYm9k eS5lbC1jYXBpdGFuIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0p OiBEZWxldGVkLgorICAgICAgICAoYm9keS5lbC1jYXBpdGFuIC50b29sYmFyIC5zZWFyY2gtYmFy ID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Zm9jdXMpOiBEZWxldGVkLgorICAgICAgICAoYm9keS5l bC1jYXBpdGFuIC50b29sYmFyIC5pdGVtLmJ1dHRvbjphY3RpdmUpOiBEZWxldGVkLgorICAgICAg ICAoYm9keS5lbC1jYXBpdGFuLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNv bnRhaW5lcik6IERlbGV0ZWQuCisKIDIwMTUtMDgtMDcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29A YXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE9wdGlvbitVcC9Eb3duIGFycm93 IGtleXMgc2hvdWxkIGluY3JlbWVudC9kZWNyZW1lbnQgbnVtYmVycyBpbiBIVE1MIGFuZCBTVkcg YXR0cmlidXRlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFz ZS9NYWluLmpzCmluZGV4IGI4YzczNmIuLjFmNTZiMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKQEAgLTE5MCw4ICsxOTAsMTMgQEAg V2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQgPSBmdW5jdGlvbigpCiAgICAgZG9jdW1lbnQuYm9k eS5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5uYW1lICsgIi1wbGF0Zm9ybSIp OwogICAgIGlmIChXZWJJbnNwZWN0b3IuUGxhdGZvcm0uaXNOaWdodGx5QnVpbGQpCiAgICAgICAg IGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZCgibmlnaHRseS1idWlsZCIpOwotICAgIGlmIChX ZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5uYW1lKQotICAgICAgICBkb2N1bWVudC5ib2R5 LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ubmFtZSk7CisKKyAg ICBpZiAoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLm5hbWUgPT09ICJtYWMiKSB7CisgICAgICAgIGlm IChXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNlID49IDExKQorICAgICAgICAg ICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKCJsYXRlc3QtbWFjIik7CisgICAgICAgIGVs c2UKKyAgICAgICAgICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZCgibGVnYWN5LW1hYyIp OworICAgIH0KIAogICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZCh0aGlzLmRlYnVnZ2Fi bGVUeXBlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVG9vbGJhci5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Ub29sYmFyLmNzcwppbmRleCAxOGZiNWI0Li43MGE5NzU1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Ub29sYmFyLmNzcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Ub29sYmFyLmNzcwpA QCAtMTE0LDkgKzExNCw5IEBAIGJvZHkubWFjLXBsYXRmb3JtOm5vdCguZG9ja2VkKSAudG9vbGJh ciB7CiAgICAgbWFyZ2luLWxlZnQ6IDRweDsKIH0KIAotYm9keTpub3QoLmVsLWNhcGl0YW4pIC50 b29sYmFyIC5pdGVtLmJ1dHRvbiwKLWJvZHk6bm90KC5lbC1jYXBpdGFuKSAudG9vbGJhciAuc2Vh cmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdLAotYm9keTpub3QoLmVsLWNhcGl0YW4pIC50 b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKK2JvZHkubGVnYWN5LW1hYyAudG9vbGJhciAu aXRlbS5idXR0b24sCitib2R5LmxlZ2FjeS1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1 dFt0eXBlPSJzZWFyY2giXSwKK2JvZHkubGVnYWN5LW1hYyAudG9vbGJhciAuZGFzaGJvYXJkLWNv bnRhaW5lciB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDAsIDAlLCA5OSUpOwogICAgIGJv cmRlcjogMXB4IHNvbGlkIHRyYW5zcGFyZW50OwogICAgIGJvcmRlci10b3AtY29sb3I6IGhzbCgw LCAwJSwgMTAwJSk7CkBAIC0xMjQsMzEgKzEyNCwzMSBAQCBib2R5Om5vdCguZWwtY2FwaXRhbikg LnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIgewogICAgIGJvcmRlci1yYWRpdXM6IDRweDsK IH0KIAotYm9keTpub3QoLmVsLWNhcGl0YW4pIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRb dHlwZT0ic2VhcmNoIl0geworYm9keS5sZWdhY3ktbWFjIC50b29sYmFyIC5zZWFyY2gtYmFyID4g aW5wdXRbdHlwZT0ic2VhcmNoIl0gewogICAgIGJveC1zaGFkb3c6IDAgMCAwIDdweCBoc2xhKDIx MSwgOTYlLCA0OCUsIDApOwogICAgIHRyYW5zaXRpb246IGJveC1zaGFkb3cgLjI1cyBjdWJpYy1i ZXppZXIoMC4xNjUsIDAuODQwLCAwLjQ0MCwgMSkgLyogZWFzZU91dFF1YXJ0ICovOwogfQogCi1i b2R5Om5vdCguZWwtY2FwaXRhbikgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJz ZWFyY2giXTpmb2N1cyB7Citib2R5LmxlZ2FjeS1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBp bnB1dFt0eXBlPSJzZWFyY2giXTpmb2N1cyB7CiAgICAgYm94LXNoYWRvdzogaHNsYSgwLCAwJSwg MCUsIDAuMTUpIDAgMXB4IDAsIDAgMCAwIDNweCBoc2xhKDIxMSwgOTYlLCA0OCUsIDAuNCk7CiB9 CiAKLWJvZHk6bm90KC5lbC1jYXBpdGFuKSAudG9vbGJhciAuaXRlbS5idXR0b246YWN0aXZlIHsK K2JvZHkubGVnYWN5LW1hYyAudG9vbGJhciAuaXRlbS5idXR0b246YWN0aXZlIHsKICAgICBib3Jk ZXItdG9wLWNvbG9yOiBoc2woMCwgMCUsIDk0JSk7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNs KDAsIDAlLCA4OSUpOwogfQogCi1ib2R5LndpbmRvdy1pbmFjdGl2ZTpub3QoLmVsLWNhcGl0YW4p IC50b29sYmFyIC5pdGVtLmJ1dHRvbiwKLWJvZHkud2luZG93LWluYWN0aXZlOm5vdCguZWwtY2Fw aXRhbikgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSwKLWJvZHku d2luZG93LWluYWN0aXZlOm5vdCguZWwtY2FwaXRhbikgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250 YWluZXIgeworYm9keS53aW5kb3ctaW5hY3RpdmUubGVnYWN5LW1hYyAudG9vbGJhciAuaXRlbS5i dXR0b24sCitib2R5LndpbmRvdy1pbmFjdGl2ZS5sZWdhY3ktbWFjIC50b29sYmFyIC5zZWFyY2gt YmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0sCitib2R5LndpbmRvdy1pbmFjdGl2ZS5sZWdhY3kt bWFjIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKICAgICBib3JkZXI6IDFweCBzb2xp ZCBoc2woMCwgMCUsIDg2JSk7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDAsIDAlLCA5NiUp OwogICAgIGJveC1zaGFkb3c6IG5vbmU7CiB9CiAKLWJvZHkuZWwtY2FwaXRhbiAudG9vbGJhciAu aXRlbS5idXR0b24sCi1ib2R5LmVsLWNhcGl0YW4gLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1 dFt0eXBlPSJzZWFyY2giXSwKLWJvZHkuZWwtY2FwaXRhbiAudG9vbGJhciAuZGFzaGJvYXJkLWNv bnRhaW5lciB7Citib2R5LmxhdGVzdC1tYWMgLnRvb2xiYXIgLml0ZW0uYnV0dG9uLAorYm9keS5s YXRlc3QtbWFjIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0sCiti b2R5LmxhdGVzdC1tYWMgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIgewogICAgIGJhY2tn cm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudChoc2woMCwgMCUsIDk5JSksIGhzbCgwLCAwJSwg OTQlKSk7CiAgICAgYm94LXNoYWRvdzogaHNsYSgwLCAwJSwgMCUsIDAuMykgMCAxcHggMXB4IC0x cHg7CiAKQEAgLTE1OCwzMyArMTU4LDMzIEBAIGJvZHkuZWwtY2FwaXRhbiAudG9vbGJhciAuZGFz aGJvYXJkLWNvbnRhaW5lciB7CiAgICAgYm9yZGVyLWJvdHRvbS1jb2xvcjogaHNsKDAsIDAlLCA3 NiUpOwogfQogCi1ib2R5LmVsLWNhcGl0YW4gLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0 eXBlPSJzZWFyY2giXSB7Citib2R5LmxhdGVzdC1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBp bnB1dFt0eXBlPSJzZWFyY2giXSB7CiAgICAgYm94LXNoYWRvdzogaHNsYSgwLCAwJSwgMCUsIDAu MykgMCAxcHggMXB4IC0xcHgsIDAgMCAwIDdweCBoc2xhKDIxMSwgOTYlLCA0OCUsIDApOwogICAg IHRyYW5zaXRpb246IGJveC1zaGFkb3cgLjI1cyBjdWJpYy1iZXppZXIoMC4xNjUsIDAuODQwLCAw LjQ0MCwgMSkgLyogZWFzZU91dFF1YXJ0ICovOwogfQogCi1ib2R5LmVsLWNhcGl0YW4gLnRvb2xi YXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTpmb2N1cyB7Citib2R5LmxhdGVz dC1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTpmb2N1cyB7 CiAgICAgYm94LXNoYWRvdzogaHNsYSgwLCAwJSwgMCUsIDAuMTUpIDAgMXB4IDAsIDAgMCAwIDNw eCBoc2xhKDIxMSwgOTYlLCA0OCUsIDAuNCk7CiB9CiAKIEBtZWRpYSAoLXdlYmtpdC1taW4tZGV2 aWNlLXBpeGVsLXJhdGlvOiAyKSB7Ci0gICAgYm9keS5lbC1jYXBpdGFuIC50b29sYmFyIC5pdGVt LmJ1dHRvbiwKLSAgICBib2R5LmVsLWNhcGl0YW4gLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1 dFt0eXBlPSJzZWFyY2giXSwKLSAgICBib2R5LmVsLWNhcGl0YW4gLnRvb2xiYXIgLmRhc2hib2Fy ZC1jb250YWluZXIgeworICAgIGJvZHkubGF0ZXN0LW1hYyAudG9vbGJhciAuaXRlbS5idXR0b24s CisgICAgYm9keS5sYXRlc3QtbWFjIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0i c2VhcmNoIl0sCisgICAgYm9keS5sYXRlc3QtbWFjIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFp bmVyIHsKICAgICAgICAgYm9yZGVyOiAwLjVweCBzb2xpZCBoc2woMCwgMCUsIDc4JSk7CiAgICAg ICAgIGJvcmRlci10b3AtY29sb3I6IGhzbCgwLCAwJSwgODAlKTsKICAgICAgICAgYm9yZGVyLWJv dHRvbS1jb2xvcjogaHNsKDAsIDAlLCA2NSUpOwogICAgIH0KIH0KIAotYm9keS5lbC1jYXBpdGFu IC50b29sYmFyIC5pdGVtLmJ1dHRvbjphY3RpdmUgeworYm9keS5sYXRlc3QtbWFjIC50b29sYmFy IC5pdGVtLmJ1dHRvbjphY3RpdmUgewogICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFk aWVudChoc2woMCwgMCUsIDg5JSksIGhzbCgwLCAwJSwgODYlKSk7CiAgICAgYm94LXNoYWRvdzog aHNsYSgwLCAwJSwgMCUsIDAuMykgMCAxcHggMXB4IC0xcHgsIGluc2V0IDAgMXB4IDFweCAtMXB4 IHdoaXRlOwogfQogCi1ib2R5LmVsLWNhcGl0YW4ud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5p dGVtLmJ1dHRvbiwKLWJvZHkuZWwtY2FwaXRhbi53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLnNl YXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSwKLWJvZHkuZWwtY2FwaXRhbi53aW5kb3ct aW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIgeworYm9keS5sYXRlc3QtbWFj LndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuaXRlbS5idXR0b24sCitib2R5LmxhdGVzdC1tYWMu d2luZG93LWluYWN0aXZlIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNo Il0sCitib2R5LmxhdGVzdC1tYWMud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5kYXNoYm9hcmQt Y29udGFpbmVyIHsKICAgICBvcGFjaXR5OiAwLjY1OwogICAgIGJvcmRlci1jb2xvcjogaHNsYSgw LCAwJSwgMCUsIDAuMTUpOwogICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50OwpAQCAt MTkyLDkgKzE5Miw5IEBAIGJvZHkuZWwtY2FwaXRhbi53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIg LmRhc2hib2FyZC1jb250YWluZXIgewogfQogCiBAbWVkaWEgKC13ZWJraXQtbWluLWRldmljZS1w aXhlbC1yYXRpbzogMikgewotICAgIGJvZHkuZWwtY2FwaXRhbi53aW5kb3ctaW5hY3RpdmUgLnRv b2xiYXIgLml0ZW0uYnV0dG9uLAotICAgIGJvZHkuZWwtY2FwaXRhbi53aW5kb3ctaW5hY3RpdmUg LnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSwKLSAgICBib2R5LmVs LWNhcGl0YW4ud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsK KyAgICBib2R5LmxhdGVzdC1tYWMud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5pdGVtLmJ1dHRv biwKKyAgICBib2R5LmxhdGVzdC1tYWMud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5zZWFyY2gt YmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0sCisgICAgYm9keS5sYXRlc3QtbWFjLndpbmRvdy1p bmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CiAgICAgICAgIGJveC1zaGFk b3c6IGluc2V0IDAgMCAxcHggMCBoc2xhKDAsIDAlLCAwJSwgMC4xKTsKICAgICB9CiB9Cg== 258536 2015-08-07 15:30:24 -0700 2015-08-07 16:25:54 -0700 Patch patch.txt text/plain 8375 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDlhMjc1MTUuLmQxMDEwYTMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE1LTA4LTA3ICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNpbXBs aWZ5IE9TLXNwZWNpZmljIENTUyBjbGFzcyBuYW1lcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3Nzk0CisKKyAgICAgICAgUmVwbGFjZSAiYm9keTpu b3QoLmVsLWNhcGl0YW4pIiB3aXRoICIubGVnYWN5LW1hYyIuCisgICAgICAgIFJlcGxhY2UgImJv ZHkuZWwtY2FwaXRhbiIgd2l0aCAiLmxhdGVzdC1tYWMiLgorCisgICAgICAgIFJldmlld2VkIGJ5 IFRpbW90aHkgSGF0Y2hlci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQpOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvVG9vbGJhci5jc3M6CisgICAgICAgIChib2R5LmxlZ2FjeS1tYWMgLnRv b2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIpOgorICAgICAgICAoYm9keS5sZWdhY3ktbWFjIC50 b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0pOgorICAgICAgICAoYm9k eS5sZWdhY3ktbWFjIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06 Zm9jdXMpOgorICAgICAgICAoYm9keS5sZWdhY3ktbWFjIC50b29sYmFyIC5pdGVtLmJ1dHRvbjph Y3RpdmUpOgorICAgICAgICAoYm9keS53aW5kb3ctaW5hY3RpdmUubGVnYWN5LW1hYyAudG9vbGJh ciAuZGFzaGJvYXJkLWNvbnRhaW5lcik6CisgICAgICAgIChib2R5LmxhdGVzdC1tYWMgLnRvb2xi YXIgLmRhc2hib2FyZC1jb250YWluZXIpOgorICAgICAgICAoYm9keS5sYXRlc3QtbWFjIC50b29s YmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0pOgorICAgICAgICAoYm9keS5s YXRlc3QtbWFjIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Zm9j dXMpOgorICAgICAgICAoQG1lZGlhICgtd2Via2l0LW1pbi1kZXZpY2UtcGl4ZWwtcmF0aW86IDIp KToKKyAgICAgICAgKGJvZHkubGF0ZXN0LW1hYyAudG9vbGJhciAuaXRlbS5idXR0b246YWN0aXZl KToKKyAgICAgICAgKGJvZHkubGF0ZXN0LW1hYy53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRh c2hib2FyZC1jb250YWluZXIpOgorICAgICAgICAoYm9keTpub3QoLmVsLWNhcGl0YW4pIC50b29s YmFyIC5kYXNoYm9hcmQtY29udGFpbmVyKTogRGVsZXRlZC4KKyAgICAgICAgKGJvZHk6bm90KC5l bC1jYXBpdGFuKSAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdKTog RGVsZXRlZC4KKyAgICAgICAgKGJvZHk6bm90KC5lbC1jYXBpdGFuKSAudG9vbGJhciAuc2VhcmNo LWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdOmZvY3VzKTogRGVsZXRlZC4KKyAgICAgICAgKGJv ZHk6bm90KC5lbC1jYXBpdGFuKSAudG9vbGJhciAuaXRlbS5idXR0b246YWN0aXZlKTogRGVsZXRl ZC4KKyAgICAgICAgKGJvZHkud2luZG93LWluYWN0aXZlOm5vdCguZWwtY2FwaXRhbikgLnRvb2xi YXIgLmRhc2hib2FyZC1jb250YWluZXIpOiBEZWxldGVkLgorICAgICAgICAoYm9keS5lbC1jYXBp dGFuIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyKTogRGVsZXRlZC4KKyAgICAgICAgKGJv ZHkuZWwtY2FwaXRhbiAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJd KTogRGVsZXRlZC4KKyAgICAgICAgKGJvZHkuZWwtY2FwaXRhbiAudG9vbGJhciAuc2VhcmNoLWJh ciA+IGlucHV0W3R5cGU9InNlYXJjaCJdOmZvY3VzKTogRGVsZXRlZC4KKyAgICAgICAgKGJvZHku ZWwtY2FwaXRhbiAudG9vbGJhciAuaXRlbS5idXR0b246YWN0aXZlKTogRGVsZXRlZC4KKyAgICAg ICAgKGJvZHkuZWwtY2FwaXRhbi53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2FyZC1j b250YWluZXIpOiBEZWxldGVkLgorCiAyMDE1LTA4LTA3ICBEZXZpbiBSb3Vzc28gIDxkcm91c3Nv QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBPcHRpb24rVXAvRG93biBhcnJv dyBrZXlzIHNob3VsZCBpbmNyZW1lbnQvZGVjcmVtZW50IG51bWJlcnMgaW4gSFRNTCBhbmQgU1ZH IGF0dHJpYnV0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jh c2UvTWFpbi5qcwppbmRleCBiOGM3MzZiLi4xZjU2YjM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBAIC0xOTAsOCArMTkwLDEzIEBA IFdlYkluc3BlY3Rvci5jb250ZW50TG9hZGVkID0gZnVuY3Rpb24oKQogICAgIGRvY3VtZW50LmJv ZHkuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuUGxhdGZvcm0ubmFtZSArICItcGxhdGZvcm0i KTsKICAgICBpZiAoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLmlzTmlnaHRseUJ1aWxkKQogICAgICAg ICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC5hZGQoIm5pZ2h0bHktYnVpbGQiKTsKLSAgICBpZiAo V2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ubmFtZSkKLSAgICAgICAgZG9jdW1lbnQuYm9k eS5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLm5hbWUpOworCisg ICAgaWYgKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5uYW1lID09PSAibWFjIikgeworICAgICAgICBp ZiAoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ucmVsZWFzZSA+PSAxMSkKKyAgICAgICAg ICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZCgibGF0ZXN0LW1hYyIpOworICAgICAgICBl bHNlCisgICAgICAgICAgICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC5hZGQoImxlZ2FjeS1tYWMi KTsKKyAgICB9CiAKICAgICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC5hZGQodGhpcy5kZWJ1Z2dh YmxlVHlwZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1Rvb2xiYXIuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVG9vbGJhci5jc3MKaW5kZXggMThmYjViNC4uNzBhOTc1NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVG9vbGJhci5jc3MKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVG9vbGJhci5jc3MK QEAgLTExNCw5ICsxMTQsOSBAQCBib2R5Lm1hYy1wbGF0Zm9ybTpub3QoLmRvY2tlZCkgLnRvb2xi YXIgewogICAgIG1hcmdpbi1sZWZ0OiA0cHg7CiB9CiAKLWJvZHk6bm90KC5lbC1jYXBpdGFuKSAu dG9vbGJhciAuaXRlbS5idXR0b24sCi1ib2R5Om5vdCguZWwtY2FwaXRhbikgLnRvb2xiYXIgLnNl YXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSwKLWJvZHk6bm90KC5lbC1jYXBpdGFuKSAu dG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7Citib2R5LmxlZ2FjeS1tYWMgLnRvb2xiYXIg Lml0ZW0uYnV0dG9uLAorYm9keS5sZWdhY3ktbWFjIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5w dXRbdHlwZT0ic2VhcmNoIl0sCitib2R5LmxlZ2FjeS1tYWMgLnRvb2xiYXIgLmRhc2hib2FyZC1j b250YWluZXIgewogICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgwLCAwJSwgOTklKTsKICAgICBi b3JkZXI6IDFweCBzb2xpZCB0cmFuc3BhcmVudDsKICAgICBib3JkZXItdG9wLWNvbG9yOiBoc2wo MCwgMCUsIDEwMCUpOwpAQCAtMTI0LDMxICsxMjQsMzEgQEAgYm9keTpub3QoLmVsLWNhcGl0YW4p IC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKICAgICBib3JkZXItcmFkaXVzOiA0cHg7 CiB9CiAKLWJvZHk6bm90KC5lbC1jYXBpdGFuKSAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0 W3R5cGU9InNlYXJjaCJdIHsKK2JvZHkubGVnYWN5LW1hYyAudG9vbGJhciAuc2VhcmNoLWJhciA+ IGlucHV0W3R5cGU9InNlYXJjaCJdIHsKICAgICBib3gtc2hhZG93OiAwIDAgMCA3cHggaHNsYSgy MTEsIDk2JSwgNDglLCAwKTsKICAgICB0cmFuc2l0aW9uOiBib3gtc2hhZG93IC4yNXMgY3ViaWMt YmV6aWVyKDAuMTY1LCAwLjg0MCwgMC40NDAsIDEpIC8qIGVhc2VPdXRRdWFydCAqLzsKIH0KIAot Ym9keTpub3QoLmVsLWNhcGl0YW4pIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0i c2VhcmNoIl06Zm9jdXMgeworYm9keS5sZWdhY3ktbWFjIC50b29sYmFyIC5zZWFyY2gtYmFyID4g aW5wdXRbdHlwZT0ic2VhcmNoIl06Zm9jdXMgewogICAgIGJveC1zaGFkb3c6IGhzbGEoMCwgMCUs IDAlLCAwLjE1KSAwIDFweCAwLCAwIDAgMCAzcHggaHNsYSgyMTEsIDk2JSwgNDglLCAwLjQpOwog fQogCi1ib2R5Om5vdCguZWwtY2FwaXRhbikgLnRvb2xiYXIgLml0ZW0uYnV0dG9uOmFjdGl2ZSB7 Citib2R5LmxlZ2FjeS1tYWMgLnRvb2xiYXIgLml0ZW0uYnV0dG9uOmFjdGl2ZSB7CiAgICAgYm9y ZGVyLXRvcC1jb2xvcjogaHNsKDAsIDAlLCA5NCUpOwogICAgIGJhY2tncm91bmQtY29sb3I6IGhz bCgwLCAwJSwgODklKTsKIH0KIAotYm9keS53aW5kb3ctaW5hY3RpdmU6bm90KC5lbC1jYXBpdGFu KSAudG9vbGJhciAuaXRlbS5idXR0b24sCi1ib2R5LndpbmRvdy1pbmFjdGl2ZTpub3QoLmVsLWNh cGl0YW4pIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0sCi1ib2R5 LndpbmRvdy1pbmFjdGl2ZTpub3QoLmVsLWNhcGl0YW4pIC50b29sYmFyIC5kYXNoYm9hcmQtY29u dGFpbmVyIHsKK2JvZHkud2luZG93LWluYWN0aXZlLmxlZ2FjeS1tYWMgLnRvb2xiYXIgLml0ZW0u YnV0dG9uLAorYm9keS53aW5kb3ctaW5hY3RpdmUubGVnYWN5LW1hYyAudG9vbGJhciAuc2VhcmNo LWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdLAorYm9keS53aW5kb3ctaW5hY3RpdmUubGVnYWN5 LW1hYyAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CiAgICAgYm9yZGVyOiAxcHggc29s aWQgaHNsKDAsIDAlLCA4NiUpOwogICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgwLCAwJSwgOTYl KTsKICAgICBib3gtc2hhZG93OiBub25lOwogfQogCi1ib2R5LmVsLWNhcGl0YW4gLnRvb2xiYXIg Lml0ZW0uYnV0dG9uLAotYm9keS5lbC1jYXBpdGFuIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5w dXRbdHlwZT0ic2VhcmNoIl0sCi1ib2R5LmVsLWNhcGl0YW4gLnRvb2xiYXIgLmRhc2hib2FyZC1j b250YWluZXIgeworYm9keS5sYXRlc3QtbWFjIC50b29sYmFyIC5pdGVtLmJ1dHRvbiwKK2JvZHku bGF0ZXN0LW1hYyAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdLAor Ym9keS5sYXRlc3QtbWFjIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKICAgICBiYWNr Z3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQoaHNsKDAsIDAlLCA5OSUpLCBoc2woMCwgMCUs IDk0JSkpOwogICAgIGJveC1zaGFkb3c6IGhzbGEoMCwgMCUsIDAlLCAwLjMpIDAgMXB4IDFweCAt MXB4OwogCkBAIC0xNTgsMzMgKzE1OCwzMyBAQCBib2R5LmVsLWNhcGl0YW4gLnRvb2xiYXIgLmRh c2hib2FyZC1jb250YWluZXIgewogICAgIGJvcmRlci1ib3R0b20tY29sb3I6IGhzbCgwLCAwJSwg NzYlKTsKIH0KIAotYm9keS5lbC1jYXBpdGFuIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRb dHlwZT0ic2VhcmNoIl0geworYm9keS5sYXRlc3QtbWFjIC50b29sYmFyIC5zZWFyY2gtYmFyID4g aW5wdXRbdHlwZT0ic2VhcmNoIl0gewogICAgIGJveC1zaGFkb3c6IGhzbGEoMCwgMCUsIDAlLCAw LjMpIDAgMXB4IDFweCAtMXB4LCAwIDAgMCA3cHggaHNsYSgyMTEsIDk2JSwgNDglLCAwKTsKICAg ICB0cmFuc2l0aW9uOiBib3gtc2hhZG93IC4yNXMgY3ViaWMtYmV6aWVyKDAuMTY1LCAwLjg0MCwg MC40NDAsIDEpIC8qIGVhc2VPdXRRdWFydCAqLzsKIH0KIAotYm9keS5lbC1jYXBpdGFuIC50b29s YmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Zm9jdXMgeworYm9keS5sYXRl c3QtbWFjIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Zm9jdXMg ewogICAgIGJveC1zaGFkb3c6IGhzbGEoMCwgMCUsIDAlLCAwLjE1KSAwIDFweCAwLCAwIDAgMCAz cHggaHNsYSgyMTEsIDk2JSwgNDglLCAwLjQpOwogfQogCiBAbWVkaWEgKC13ZWJraXQtbWluLWRl dmljZS1waXhlbC1yYXRpbzogMikgewotICAgIGJvZHkuZWwtY2FwaXRhbiAudG9vbGJhciAuaXRl bS5idXR0b24sCi0gICAgYm9keS5lbC1jYXBpdGFuIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5w dXRbdHlwZT0ic2VhcmNoIl0sCi0gICAgYm9keS5lbC1jYXBpdGFuIC50b29sYmFyIC5kYXNoYm9h cmQtY29udGFpbmVyIHsKKyAgICBib2R5LmxhdGVzdC1tYWMgLnRvb2xiYXIgLml0ZW0uYnV0dG9u LAorICAgIGJvZHkubGF0ZXN0LW1hYyAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9 InNlYXJjaCJdLAorICAgIGJvZHkubGF0ZXN0LW1hYyAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRh aW5lciB7CiAgICAgICAgIGJvcmRlcjogMC41cHggc29saWQgaHNsKDAsIDAlLCA3OCUpOwogICAg ICAgICBib3JkZXItdG9wLWNvbG9yOiBoc2woMCwgMCUsIDgwJSk7CiAgICAgICAgIGJvcmRlci1i b3R0b20tY29sb3I6IGhzbCgwLCAwJSwgNjUlKTsKICAgICB9CiB9CiAKLWJvZHkuZWwtY2FwaXRh biAudG9vbGJhciAuaXRlbS5idXR0b246YWN0aXZlIHsKK2JvZHkubGF0ZXN0LW1hYyAudG9vbGJh ciAuaXRlbS5idXR0b246YWN0aXZlIHsKICAgICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3Jh ZGllbnQoaHNsKDAsIDAlLCA4OSUpLCBoc2woMCwgMCUsIDg2JSkpOwogICAgIGJveC1zaGFkb3c6 IGhzbGEoMCwgMCUsIDAlLCAwLjMpIDAgMXB4IDFweCAtMXB4LCBpbnNldCAwIDFweCAxcHggLTFw eCB3aGl0ZTsKIH0KIAotYm9keS5lbC1jYXBpdGFuLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAu aXRlbS5idXR0b24sCi1ib2R5LmVsLWNhcGl0YW4ud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5z ZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0sCi1ib2R5LmVsLWNhcGl0YW4ud2luZG93 LWluYWN0aXZlIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKK2JvZHkubGF0ZXN0LW1h Yy53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLml0ZW0uYnV0dG9uLAorYm9keS5sYXRlc3QtbWFj LndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJj aCJdLAorYm9keS5sYXRlc3QtbWFjLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJk LWNvbnRhaW5lciB7CiAgICAgb3BhY2l0eTogMC42NTsKICAgICBib3JkZXItY29sb3I6IGhzbGEo MCwgMCUsIDAlLCAwLjE1KTsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKQEAg LTE5Miw5ICsxOTIsOSBAQCBib2R5LmVsLWNhcGl0YW4ud2luZG93LWluYWN0aXZlIC50b29sYmFy IC5kYXNoYm9hcmQtY29udGFpbmVyIHsKIH0KIAogQG1lZGlhICgtd2Via2l0LW1pbi1kZXZpY2Ut cGl4ZWwtcmF0aW86IDIpIHsKLSAgICBib2R5LmVsLWNhcGl0YW4ud2luZG93LWluYWN0aXZlIC50 b29sYmFyIC5pdGVtLmJ1dHRvbiwKLSAgICBib2R5LmVsLWNhcGl0YW4ud2luZG93LWluYWN0aXZl IC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0sCi0gICAgYm9keS5l bC1jYXBpdGFuLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7 CisgICAgYm9keS5sYXRlc3QtbWFjLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuaXRlbS5idXR0 b24sCisgICAgYm9keS5sYXRlc3QtbWFjLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuc2VhcmNo LWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdLAorICAgIGJvZHkubGF0ZXN0LW1hYy53aW5kb3ct aW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIgewogICAgICAgICBib3gtc2hh ZG93OiBpbnNldCAwIDAgMXB4IDAgaHNsYSgwLCAwJSwgMCUsIDAuMSk7CiAgICAgfQogfQo=