135788 2014-08-10 02:49:03 -0700 Web Inspector: DataGrid and its clients are a cluster-cuss of styles 2014-08-11 11:43:30 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1028091 0 timothy 2014-08-10 02:49:03 -0700 A few regressions with the new look and just a general mess of styles and overrides. All DataGrids should look like the Timeline data grids. 1028092 1 webkit-bug-importer 2014-08-10 02:49:40 -0700 <rdar://problem/17971237> 1028093 2 236345 timothy 2014-08-10 02:51:45 -0700 Created attachment 236345 Patch 1028247 3 236345 joepeck 2014-08-11 11:38:52 -0700 Comment on attachment 236345 Patch r=me 1028252 4 236345 commit-queue 2014-08-11 11:43:27 -0700 Comment on attachment 236345 Patch Clearing flags on attachment: 236345 Committed r172399: <http://trac.webkit.org/changeset/172399> 1028253 5 commit-queue 2014-08-11 11:43:30 -0700 All reviewed patches have been landed. Closing bug. 236345 2014-08-10 02:51:45 -0700 2014-08-11 11:43:27 -0700 Patch bug-135788-20140810025134.patch text/plain 47783 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMzcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBm ZDA4YjliMzNjMTFmMWM4MGEzNjc5NTJkY2I5ZGRiZWQ4ODI4MmRhLi41ZGQ1NDdhMDU0ZDUyMWNi NGViY2U2YTQ4Mzk3MDhjM2I0M2ZlYTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxMTIgQEAKIDIwMTQtMDgtMTAgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUu Y29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IERhdGFHcmlkIGFuZCBpdHMgY2xpZW50cyBh cmUgYSBjbHVzdGVyLWN1c3Mgb2Ygc3R5bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU3ODgKKworICAgICAgICBDbGVhbiB1cCBEYXRhR3JpZCBh bmQgaXRzIHN1YmNsYXNzZXMgYW5kIGNsaWVudCBzdHlsZXMuCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xv Y2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9BcHBsaWNh dGlvbkNhY2hlRnJhbWVDb250ZW50Vmlldy5jc3M6CisgICAgICAgICguY29udGVudC12aWV3LmFw cGxpY2F0aW9uLWNhY2hlLWZyYW1lID4gLmRhdGEtZ3JpZCk6CisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9Db29raWVTdG9yYWdlQ29udGVudFZpZXcuY3NzOgorICAgICAgICAoLmNvbnRl bnQtdmlldy5jb29raWUtc3RvcmFnZSA+IC5kYXRhLWdyaWQpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3LmNzczoKKyAgICAgICAgKC5jb250ZW50 LXZpZXcuZG9tLXN0b3JhZ2UgPiAuZGF0YS1ncmlkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL0RPTVRyZWVEYXRhR3JpZC5jc3M6CisgICAgICAgICguZG9tLXRyZWUtZGF0YS1ncmlk IC5kYXRhLWdyaWQpOgorICAgICAgICAoLmRvbS10cmVlLWRhdGEtZ3JpZCAubmFtZS1jb2x1bW4g Lmljb24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZURhdGFHcmlkLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVEYXRhR3JpZCk6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5jc3M6CisgICAgICAgICguZGF0YS1ncmlkKToKKyAg ICAgICAgKC5kYXRhLWdyaWQgdGFibGUpOgorICAgICAgICAoLmRhdGEtZ3JpZCAuZGF0YS1jb250 YWluZXIpOgorICAgICAgICAoLmRhdGEtZ3JpZC5pbmxpbmUpOgorICAgICAgICAoLmRhdGEtZ3Jp ZCB0aCk6CisgICAgICAgICguZGF0YS1ncmlkIDotd2Via2l0LWFueSh0aCwgdGQpOm5vdCg6bGFz dC1jaGlsZCkpOgorICAgICAgICAoLmRhdGEtZ3JpZCB0aC5zb3J0YWJsZTphY3RpdmUpOgorICAg ICAgICAoLmRhdGEtZ3JpZCB0aDotd2Via2l0LWFueSguc29ydC1hc2NlbmRpbmcsIC5zb3J0LWRl c2NlbmRpbmcpKToKKyAgICAgICAgKC5kYXRhLWdyaWQgdGFibGUuZGF0YSk6CisgICAgICAgICgu ZGF0YS1ncmlkIHRkKToKKyAgICAgICAgKC5kYXRhLWdyaWQ6Zm9jdXMgdHIuc2VsZWN0ZWQgdGQ6 bm90KDpsYXN0LWNoaWxkKSk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRh dGEtZ3JpZDpmb2N1cyB0ci5zZWxlY3RlZCB0ZDpub3QoOmxhc3QtY2hpbGQpKToKKyAgICAgICAg KC5kYXRhLWdyaWQgOi13ZWJraXQtYW55KHRoLCB0ZCkgPiBkaXYpOgorICAgICAgICAoLmRhdGEt Z3JpZCB0aDotd2Via2l0LWFueSguc29ydC1hc2NlbmRpbmcsIC5zb3J0LWRlc2NlbmRpbmcpID4g ZGl2OmZpcnN0LWNoaWxkKToKKyAgICAgICAgKC5kYXRhLWdyaWQgdGguc29ydC1hc2NlbmRpbmcg PiBkaXY6Zmlyc3QtY2hpbGQ6OmFmdGVyKToKKyAgICAgICAgKC5kYXRhLWdyaWQgdGguc29ydC1k ZXNjZW5kaW5nID4gZGl2OmZpcnN0LWNoaWxkOjphZnRlcik6CisgICAgICAgICguZGF0YS1ncmlk IHRkIC5zdWJ0aXRsZSk6CisgICAgICAgICguZGF0YS1ncmlkIHRkIC5zdWJ0aXRsZTo6YmVmb3Jl KToKKyAgICAgICAgKC5kYXRhLWdyaWQ6Zm9jdXMgdHIuc2VsZWN0ZWQgdGQgLnN1YnRpdGxlKToK KyAgICAgICAgKC5kYXRhLWdyaWQgdGQuZXJyb3IpOgorICAgICAgICAoLmRhdGEtZ3JpZCB0ci5z ZWxlY3RlZCB0ZC5lcnJvcik6CisgICAgICAgICguZGF0YS1ncmlkIHRkIC5pY29uKToKKyAgICAg ICAgKC5kYXRhLWdyaWQgdGQgLmdvLXRvLWFycm93KToKKyAgICAgICAgKC5kYXRhLWdyaWQgdHI6 LXdlYmtpdC1hbnkoLnNlbGVjdGVkLCA6aG92ZXIpIC5nby10by1hcnJvdyk6CisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9EYXRhYmFzZUNvbnRlbnRWaWV3LmNzczoKKyAgICAgICAgKC5z dG9yYWdlLXZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJhc2VUYWJs ZUNvbnRlbnRWaWV3LmNzczoKKyAgICAgICAgKC5jb250ZW50LXZpZXcuZGF0YWJhc2UtdGFibGUg PiAuZGF0YS1ncmlkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0 aW9uLmNzczoKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCAuZGF0YS1ncmlk KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWREYXRhYmFzZU9iamVjdFN0 b3JlQ29udGVudFZpZXcuY3NzOgorICAgICAgICAoLmNvbnRlbnQtdmlldy5pbmRleGVkLWRhdGFi YXNlLW9iamVjdC1zdG9yZSA+IC5kYXRhLWdyaWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvTGF5ZXJUcmVlRGF0YUdyaWROb2RlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxh eWVyVHJlZURhdGFHcmlkTm9kZS5wcm90b3R5cGUuX21ha2VOYW1lQ2VsbCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuTGF5ZXJUcmVlRGF0YUdyaWROb2RlLnByb3RvdHlwZS5fdXBkYXRlTmFtZUNl bGxEYXRhKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZVNpZGViYXJQ YW5lbC5jc3M6CisgICAgICAgICgubGF5ZXItdHJlZS5wYW5lbCAuZGF0YS1ncmlkKToKKyAgICAg ICAgKC5sYXllci10cmVlLnBhbmVsIC5uYW1lLWNvbHVtbiAuaWNvbik6CisgICAgICAgICgubGF5 ZXItdHJlZS5wYW5lbCB0ci5yZWZsZWN0aW9uIC5uYW1lLWNvbHVtbiAuaWNvbik6CisgICAgICAg ICgubGF5ZXItdHJlZS5wYW5lbCB0ci5wc2V1ZG8tZWxlbWVudCAubmFtZS1jb2x1bW4gLmljb24p OgorICAgICAgICAoLmxheWVyLXRyZWUucGFuZWwgLm5hbWUtY29sdW1uIC5yZWZsZWN0aW9uKToK KyAgICAgICAgKC5sYXllci10cmVlLnBhbmVsIHRyLnNlbGVjdGVkIC5uYW1lLWNvbHVtbiAucmVm bGVjdGlvbik6CisgICAgICAgICgubGF5ZXItdHJlZS5wYW5lbCAuYm90dG9tLWJhcik6CisgICAg ICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmxheWVyLXRyZWUucGFuZWwgLmJvdHRvbS1i YXIpOgorICAgICAgICAoLmxheWVyLXRyZWUucGFuZWwgLmJvdHRvbS1iYXIgPiBkaXYpOgorICAg ICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5sYXllci10cmVlLnBhbmVsIC5ib3R0b20t YmFyID4gZGl2KToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAubGF5ZXItdHJl ZS1wb3BvdmVyKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZVNpZGVi YXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXllclRyZWVTaWRlYmFyUGFuZWwp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxheWVyVHJlZVNpZGViYXJQYW5lbC5wcm90b3R5cGUu X2J1aWxkTGF5ZXJJbmZvU2VjdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTGF5ZXJUcmVl U2lkZWJhclBhbmVsLnByb3RvdHlwZS5fYnVpbGREYXRhR3JpZFNlY3Rpb24pOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkxheWVyVHJlZVNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2J1aWxkQm90dG9t QmFyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXllclRyZWVTaWRlYmFyUGFuZWwucHJvdG90 eXBlLl91cGRhdGVNZXRyaWNzKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xlZ2Fj eUphdmFTY3JpcHRQcm9maWxlVmlldy5jc3M6CisgICAgICAgICguY29udGVudC12aWV3LnByb2Zp bGUtdmlldyA+IC5kYXRhLWdyaWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGVn YWN5UHJvZmlsZVZpZXcuY3NzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29u dGVudFZpZXcuY3NzOgorICAgICAgICAoLmNvbnNvbGUtbWVzc2FnZSAuYnViYmxlKToKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuY3NzOgorICAgICAg ICAoLnRpbWVsaW5lLXZpZXcubmV0d29yayA+IC5kYXRhLWdyaWQpOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvT3ZlcnZpZXdUaW1lbGluZVZpZXcuY3NzOgorICAgICAgICAoLnRpbWVs aW5lLXZpZXcub3ZlcnZpZXcgPiAudGltZWxpbmUtcnVsZXIgPiAuaGVhZGVyKToKKyAgICAgICAg KC50aW1lbGluZS12aWV3Lm92ZXJ2aWV3ID4gLmRhdGEtZ3JpZCk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9PdmVydmlld1RpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1Byb2JlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3M6CisgICAgICAgICguZGV0 YWlscy1zZWN0aW9uLnByb2JlLXNldCAub3B0aW9ucyA+IC5wcm9iZS1hZGQpOgorICAgICAgICAo LnBvcG92ZXIgLnByb2JlLXBvcG92ZXIpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv UHJvYmVTZXREYXRhR3JpZC5jc3M6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uLnByb2JlLXNl dCAuZGF0YS1ncmlkIHRyLnBhc3QtdmFsdWUgdGQpOgorICAgICAgICAoLmRldGFpbHMtc2VjdGlv bi5wcm9iZS1zZXQgLmRhdGEtZ3JpZCA+IHRkLnVua25vd24tdmFsdWUpOgorICAgICAgICAoLmRl dGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQgLmRhdGEtZ3JpZCB0ci5yZXZlYWxlZC5oaWdobGlnaHRl ZCk6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uLnByb2JlLXNldCAuZGF0YS1ncmlkIHRyLnNl cGFyYXRvcik6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uLnByb2JlLXNldCAuZGF0YS1ncmlk ID4gdHIuZGF0YS11cGRhdGVkKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24ucHJvYmUtc2V0 IC5kYXRhLWdyaWQgLnNlbGVjdGVkIC5zZWN0aW9uICopOgorICAgICAgICAoLmRldGFpbHMtc2Vj dGlvbi5wcm9iZS1zZXQgLmRhdGEtZ3JpZCAuc2VsZWN0ZWQgdGQudW5rbm93bi12YWx1ZSk6Cisg ICAgICAgICguZGV0YWlscy1zZWN0aW9uLnByb2JlLXNldCAuZGF0YS1ncmlkIC5zZWN0aW9uKToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5jc3M6CisgICAgICAg ICgucXVpY2stY29uc29sZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGlu ZURhdGFHcmlkLmNzczoKKyAgICAgICAgKC5kYXRhLWdyaWQudGltZWxpbmUgdGgpOgorICAgICAg ICAoLmRhdGEtZ3JpZC50aW1lbGluZSA+IC5uYXZpZ2F0aW9uLWJhci1jb250YWluZXIgPiAubmF2 aWdhdGlvbi1iYXIpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSdWxl ci5jc3M6CisgICAgICAgICgudGltZWxpbmUtcnVsZXIgPiAuaGVhZGVyKToKKyAgICAgICAgKC50 aW1lbGluZS1ydWxlciA+IC5oZWFkZXIgPiAuZGl2aWRlcik6CisKKzIwMTQtMDgtMTAgIFRpbW90 aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IG5ldyBnbHlwaHMgYXJlIHZpc2libGUgb24gT1MgWCAxMC45IGJ1aWxkcwogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1NzQzCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0 cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9s b2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDdiZjY1YTA3YWUyOWI1NWNkZGEzZDk4NDBiNzUwYjkx OGM0Mjc3MGUuLjQzMmQwODg3MGE3ZGJmZDIxNjcwZWUwZTcwNDg5YmYxZDA3OWVkOGYgMTAwNjQ0 CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEgMzAKbGNtY2IlaFdYa1c8Xy1CM2pMd3RLUmNIZHE5fkd7 WGIxVUxEK2czYCgwc3oqODRKaU5zCgpkZWx0YSAzMgpvY21jYiVoV1hrVzxfLUIzbE9JO1pGZUAt NVBjRXA/V0s1bnN0SE8xJlpLWSVeMFBVQyFLPno+JQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVGcmFtZUNvbnRl bnRWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Fw cGxpY2F0aW9uQ2FjaGVGcmFtZUNvbnRlbnRWaWV3LmNzcwppbmRleCBlMTBiMjBiMGJkYzYyMGZk YjNiMmEyMDI4Mjg3ZDRiNzIyY2NjY2I2Li5kMjMxYzFkMWFmMzMzODU4ZDk1OTJjMmQ1MzljY2Qx MzAyYjFjMDEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50Vmlldy5jc3MKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGljYXRpb25DYWNoZUZyYW1l Q29udGVudFZpZXcuY3NzCkBAIC0yOSw1ICsyOSw0IEBACiAgICAgbGVmdDogMDsKICAgICByaWdo dDogMDsKICAgICBib3R0b206IDA7Ci0gICAgYm9yZGVyOiBub25lOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFnZUNv bnRlbnRWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0Nvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5jc3MKaW5kZXggOGViN2RmMWM5ZWZhMGY4N2M4NWYz YjgyZmY1YTI4ZjE3Zjk4OTNmMy4uNGYwNGU0MjU4MzcwYzAwZGRlOGQ2OTUzZDQwZGE1ZWFlNDIw NzQ1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Db29raWVTdG9yYWdlQ29udGVudFZpZXcuY3NzCkBAIC0y OSw1ICsyOSw0IEBACiAgICAgbGVmdDogMDsKICAgICByaWdodDogMDsKICAgICBib3R0b206IDA7 Ci0gICAgYm9yZGVyOiBub25lOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3LmNzcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmlldy5j c3MKaW5kZXggMTY1OTUxMTVkMTViNDYwZGJiY2U5MzZhMmQ0YTk1NDlkMDFlZWIwNC4uZGZlZjVl YjFiYjFiMDkyNGRhNjE0MTI4MGZmZDMzZDI5ODJiZWRhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3LmNz cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01TdG9y YWdlQ29udGVudFZpZXcuY3NzCkBAIC0yOSw4ICsyOSw2IEBACiAgICAgbGVmdDogMDsKICAgICBy aWdodDogMDsKICAgICBib3R0b206IDA7Ci0gICAgb3V0bGluZTogbm9uZTsKLSAgICBib3JkZXI6 IG5vbmU7CiB9CiAKIC5jb250ZW50LXZpZXcuZG9tLXN0b3JhZ2UgPiAuZGF0YS1ncmlkIHRyLmR1 cGxpY2F0ZS1rZXkgdGQua2V5LWNvbHVtbiwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVEYXRhR3JpZC5jc3MgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRGF0YUdyaWQuY3NzCmluZGV4 IDAzOTVhMTIwYzE0OTk1ZmYwZjdkZjY3YWUwNDdiYzY0Zjc3N2EyZDAuLmY4ZmJlZTNjYTVkY2Jh ZGM5MTFjY2FlNzQ0MTliZWFmZTkxMWE2NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVEYXRhR3JpZC5jc3MKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZURhdGFHcmlkLmNzcwpA QCAtMjMsNzkgKzIzLDEzIEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAg Ki8KIAotIC5kb20tdHJlZS1kYXRhLWdyaWQgLmRhdGEtZ3JpZCB7Ci0gICAgcG9zaXRpb246IHJl bGF0aXZlOwotICAgIHRvcDogMDsKLSAgICB3aWR0aDogMTAwJTsKLSAgICBoZWlnaHQ6IDEwMCU7 Ci0gICAgLyogVHVybiBvZmYgdGhlIGRlZmF1bHQgYm9yZGVycywgd2Ugd2FudCB0byBzbmFwIHRv IGVkZ2VzLiAqLwotICAgIGJvcmRlcjogbm9uZTsKKy5kb20tdHJlZS1kYXRhLWdyaWQgLmRhdGEt Z3JpZCB7CisgICAgYm9yZGVyLXJpZ2h0OiBub25lOworICAgIGJvcmRlci1sZWZ0OiBub25lOwor ICAgIGJvcmRlci1ib3R0b206IG5vbmU7CiB9CiAKLS5kb20tdHJlZS1kYXRhLWdyaWQgLmRhdGEt Z3JpZCB0YWJsZS5kYXRhIHsKLSAgICBiYWNrZ3JvdW5kLXNpemU6IDEwMCUgNDRweDsKLX0KLQot LmRvbS10cmVlLWRhdGEtZ3JpZCAuZGF0YS1jb250YWluZXIgewotICAgIHBvc2l0aW9uOiBhYnNv bHV0ZTsKLSAgICAvKiBMZWF2ZSByb29tIGZvciB0aGUgZGF0YSBncmlkIGhlYWRlci4gKi8KLSAg ICB0b3A6IDE2cHg7Ci0gICAgLyogVXNlIGFsbCByZW1haW5pbmcgdmVydGljYWwgc3BhY2UgaW4g dGhlIGNvbnRhaW5lci4gKi8KLSAgICBib3R0b206IDA7Ci0gICAgLyogTGV0IHRoZSBpbmxpbmUg dGFibGUgY29udGVudCBzY3JvbGwsIGluZGVwZW5kZW50bHkgb2YgdGhlIGhlYWRlci4gKi8KLSAg ICBvdmVyZmxvdy15OiBhdXRvOwotICAgIG92ZXJmbG93LXg6IGhpZGRlbjsKLX0KLQotLmRvbS10 cmVlLWRhdGEtZ3JpZCAuZGF0YS1jb250YWluZXIgdHIgewotICAgIGhlaWdodDogMjJweDsKLX0K LQotLmRvbS10cmVlLWRhdGEtZ3JpZCAuZGF0YS1jb250YWluZXIgdGQgPiBkaXYgewotICAgIGRp c3BsYXk6IC13ZWJraXQtZmxleDsKLSAgICB3aWR0aDogMTAwJTsKLSAgICBoZWlnaHQ6IDEwMCU7 Ci0gICAgLXdlYmtpdC1hbGlnbi1pdGVtczogY2VudGVyOwotICAgIC13ZWJraXQtanVzdGlmeS1j b250ZW50OiBmbGV4LWVuZDsKLX0KLQotLmRvbS10cmVlLWRhdGEtZ3JpZCAuZGF0YS1jb250YWlu ZXIgLm5hbWUtY29sdW1uIHsKLSAgICBwYWRkaW5nLXJpZ2h0OiAwOwotfQotCi0uZG9tLXRyZWUt ZGF0YS1ncmlkIC5kYXRhLWNvbnRhaW5lciAubmFtZS1jb2x1bW4gLmljb24gewotICAgIHZlcnRp Y2FsLWFsaWduOiB0b3A7Ci0gICAgd2lkdGg6IDE2cHg7Ci0gICAgaGVpZ2h0OiAxNnB4OworLmRv bS10cmVlLWRhdGEtZ3JpZCAubmFtZS1jb2x1bW4gLmljb24gewogICAgIC8qIEZJWE1FOiBUaGVy ZSBjYW4gYmUgbXVsdGlwbGUgdHlwZXMgb2YgRE9NIG5vZGVzIHRoYXQgd2UgbWlnaHQgbmVlZCB0 byBzdXBwb3J0IGluIHRoZSBmdXR1cmUuICovCiAgICAgY29udGVudDogdXJsKC4uL0ltYWdlcy9E T01FbGVtZW50LnN2Zyk7CiB9Ci0KLS5kb20tdHJlZS1kYXRhLWdyaWQgLmRhdGEtY29udGFpbmVy IC5uYW1lLWNvbHVtbiAubGFiZWwgewotICAgIC13ZWJraXQtZmxleDogMTsKLSAgICBwYWRkaW5n OiAwIDRweDsKLQotICAgIHdoaXRlLXNwYWNlOiBub3dyYXA7Ci0gICAgb3ZlcmZsb3c6IGhpZGRl bjsKLSAgICB0ZXh0LW92ZXJmbG93OiBlbGxpcHNpczsKLX0KLQotLmRvbS10cmVlLWRhdGEtZ3Jp ZCAuZGF0YS1jb250YWluZXIgdHI6aG92ZXIgLm5hbWUtY29sdW1uIC5sYWJlbCB7Ci0gICAgcGFk ZGluZy1yaWdodDogMDsKLX0KLQotLmRvbS10cmVlLWRhdGEtZ3JpZCAuZGF0YS1jb250YWluZXIg LmdvLXRvLWFycm93IHsKLSAgICBkaXNwbGF5OiBub25lOwotfQotCi0uZG9tLXRyZWUtZGF0YS1n cmlkIC5kYXRhLWNvbnRhaW5lciB0cjpob3ZlciAuZ28tdG8tYXJyb3cgewotICAgIGRpc3BsYXk6 IGJsb2NrOwotfQotCi0uZG9tLXRyZWUtZGF0YS1ncmlkIC5kYXRhLWNvbnRhaW5lciB0Ym9keSA+ IHRyOm50aC1jaGlsZCgybikgewotICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOwotfQotCi0u ZG9tLXRyZWUtZGF0YS1ncmlkIC5kYXRhLWNvbnRhaW5lciB0Ym9keSA+IHRyOm50aC1jaGlsZCgy bisxKSB7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDI0MywgMjQ2LCAyNTApOwotfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJl ZURhdGFHcmlkLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RE9NVHJlZURhdGFHcmlkLmpzCmluZGV4IGU5NzgzY2YwNTIyZTMyZjA5ODU1NmNkNTA3NWNmODE0 YWExMjAwZTUuLmM5MDMxZDI2MjJjZmNkMTQ2Y2JmZWIxZGIyMTg5ZjA0YTlkNjlkMDUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVE YXRhR3JpZC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9ET01UcmVlRGF0YUdyaWQuanMKQEAgLTMxLDYgKzMxLDcgQEAgV2ViSW5zcGVjdG9yLkRPTVRy ZWVEYXRhR3JpZCA9IGZ1bmN0aW9uKCkgewogICAgIHRoaXMuX3ByZXZpb3VzSG92ZXJlZEVsZW1l bnQgPSBudWxsOwogCiAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImRvbS10cmVlLWRh dGEtZ3JpZCIpOworICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJpbmxpbmUiKTsKIAog ICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW1vdmUiLCB0aGlzLl9vbm1v dXNlbW92ZS5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoIm1vdXNlb3V0IiwgdGhpcy5fb25tb3VzZW91dC5iaW5kKHRoaXMpLCBmYWxzZSk7CkBA IC01Niw0ICs1NywzIEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRGF0YUdyaWQucHJvdG90eXBlID0g ewogICAgICAgICB0aGlzLl9wcmV2aW91c0hvdmVyZWRFbGVtZW50ID0gbnVsbDsKICAgICB9CiB9 OwotCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9EYXRhR3JpZC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9EYXRhR3JpZC5jc3MKaW5kZXggZmNkMmIwZmM1OTViNmZiN2NmZjJjYjMxZjViZTU3NDY1ZDI5 ZDZiOC4uNWQ2ZjM5MTI0MWY4YzM3YmY0ZmY5N2FlNTVhMDRhNjYyZWNlMzU1YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuY3Nz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlk LmNzcwpAQCAtMjUsNyArMjUsNiBAQAogCiAuZGF0YS1ncmlkIHsKICAgICBwb3NpdGlvbjogcmVs YXRpdmU7Ci0gICAgYm9yZGVyOiAxcHggc29saWQgI2FhYTsKICAgICBvdXRsaW5lOiBub25lOwog fQogCkBAIC00MiwxMiArNDEsMTEgQEAKICAgICBib3JkZXItc3BhY2luZzogMDsKICAgICBib3Jk ZXItY29sbGFwc2U6IGNvbGxhcHNlOwogICAgIHdpZHRoOiAxMDAlOwotICAgIGZvbnQtc2l6ZTog MTBweDsKIH0KIAogLmRhdGEtZ3JpZCAuZGF0YS1jb250YWluZXIgewogICAgIHBvc2l0aW9uOiBh YnNvbHV0ZTsKLSAgICB0b3A6IDE2cHg7CisgICAgdG9wOiAyM3B4OwogICAgIGJvdHRvbTogMDsK ICAgICBsZWZ0OiAwOwogICAgIHJpZ2h0OiAwOwpAQCAtNjAsNyArNTgsNyBAQAogfQogCiAuZGF0 YS1ncmlkLmlubGluZSB7Ci0gICAgYm9yZGVyOiAxcHggc29saWQgcmdiKDE4MSwgMTgxLCAxODEp OworICAgIGJvcmRlcjogMXB4IHNvbGlkIHJnYigxNzksIDE3OSwgMTc5KTsKIH0KIAogLmRhdGEt Z3JpZC5uby1oZWFkZXIgPiB0YWJsZS5oZWFkZXIgewpAQCAtNzUsNDIgKzczLDI5IEBACiAgICAg dGV4dC1hbGlnbjogbGVmdDsKICAgICB2ZXJ0aWNhbC1hbGlnbjogbWlkZGxlOwogCi0gICAgYm9y ZGVyLXRvcDogMXB4IHNvbGlkIHJnYigxNzksIDE3OSwgMTc5KTsKLSAgICBib3JkZXItYm90dG9t OiAxcHggc29saWQgcmdiKDE4MiwgMTgyLCAxODIpOworICAgIGJhY2tncm91bmQtY29sb3I6IHdo aXRlOwogCi0gICAgaGVpZ2h0OiAxNXB4OwotICAgIGZvbnQtd2VpZ2h0OiBub3JtYWw7Ci0gICAg cGFkZGluZzogMCA0cHg7Ci0gICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKLSAgICBvdmVyZmxvdzog aGlkZGVuOwotfQorICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCByZ2IoMTc5LCAxNzksIDE3 OSk7CiAKLWJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGF0YS1ncmlkIHRoIHsKLSAgICBiYWNr Z3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2JhKDAsIDAsIDAsIDAu MiksIHJnYmEoMCwgMCwgMCwgMC4yKSksIGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHRyYW5z cGFyZW50LCB0cmFuc3BhcmVudCksCi0gICAgICAgIGxpbmVhci1ncmFkaWVudCh0byBib3R0b20s IHdoaXRlLCB3aGl0ZSAyNSUsIHJnYigyNDQsIDI0NCwgMjQ0KSA1MCUsIHJnYigyMzYsIDIzNiwg MjM2KSA1MCUsIHJnYigyMzcsIDIzNywgMjM3KSk7Ci0KLSAgICBiYWNrZ3JvdW5kLXNpemU6IDFw eCAxMXB4LCAwIDAsIDEwMCUgMTAwJTsKLSAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiBsZWZ0IDJw eCwgcmlnaHQgMnB4LCBjZW50ZXI7Ci0gICAgYmFja2dyb3VuZC1yZXBlYXQ6IG5vLXJlcGVhdDsK KyAgICBmb250LXdlaWdodDogbm9ybWFsOwogCi0gICAgYm94LXNoYWRvdzogaW5zZXQgcmdiYSgy NTUsIDI1NSwgMjU1LCAwLjMpIDAgLTFweCAwOwotICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xp ZCByZ2IoMTgyLCAxODIsIDE4Mik7Ci19CisgICAgaGVpZ2h0OiAyMnB4OworICAgIHBhZGRpbmc6 IDAgNnB4OwogCi0uZGF0YS1ncmlkIHRoOmZpcnN0LWNoaWxkIHsKLSAgICBiYWNrZ3JvdW5kLXBv c2l0aW9uOiAtMXB4IDJweCwgcmlnaHQgMnB4LCBjZW50ZXI7CisgICAgd2hpdGUtc3BhY2U6IG5v d3JhcDsKKyAgICBvdmVyZmxvdzogaGlkZGVuOwogfQogCi0uZGF0YS1ncmlkIHRoOmFjdGl2ZTpm aXJzdC1jaGlsZCB7Ci0gICAgYmFja2dyb3VuZC1wb3NpdGlvbjogLTFweCAycHgsIHJpZ2h0IHRv cCwgY2VudGVyOworLmRhdGEtZ3JpZCA6LXdlYmtpdC1hbnkodGgsIHRkKTpub3QoOmxhc3QtY2hp bGQpIHsKKyAgICBib3JkZXItcmlnaHQ6IDFweCBzb2xpZCByZ2IoMTc5LCAxNzksIDE3OSk7CiB9 CiAKLS5kYXRhLWdyaWQgdGg6bGFzdC1jaGlsZCB7Ci0gICAgYmFja2dyb3VuZC1wb3NpdGlvbjog bGVmdCAycHgsIC0xcHggMnB4LCBjZW50ZXI7CisuZGF0YS1ncmlkIHRoLnNvcnRhYmxlOmFjdGl2 ZSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDE3OSwgMTc5LCAxNzkpOwogfQogCi0uZGF0 YS1ncmlkIHRoOmFjdGl2ZTpsYXN0LWNoaWxkIHsKLSAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiBs ZWZ0IHRvcCwgLTFweCB0b3AsIGNlbnRlcjsKKy5kYXRhLWdyaWQgdGg6LXdlYmtpdC1hbnkoLnNv cnQtYXNjZW5kaW5nLCAuc29ydC1kZXNjZW5kaW5nKSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjog cmdiKDIzMCwgMjMwLCAyMzApOwogfQogCiAuZGF0YS1ncmlkIHRyLmZpbGxlciB7CkBAIC0xMzIs NyArMTE3LDcgQEAgYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kYXRhLWdyaWQgdGggewogICAg IGhlaWdodDogMTAwJTsKICAgICBib3JkZXItdG9wOiAwIG5vbmUgdHJhbnNwYXJlbnQ7CiAgICAg YmFja2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgd2hpdGUsIHdoaXRl IDUwJSwgcmdiKDI0MywgMjQ2LCAyNTApIDUwJSwgcmdiKDI0MywgMjQ2LCAyNTApKTsKLSAgICBi YWNrZ3JvdW5kLXNpemU6IDEwMCUgMzJweDsKKyAgICBiYWNrZ3JvdW5kLXNpemU6IDEwMCUgNDJw eDsKICAgICB0YWJsZS1sYXlvdXQ6IGZpeGVkOwogfQogCkBAIC0xNTEsMTcgKzEzNiwyMSBAQCBi b2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRhdGEtZ3JpZCB0aCB7CiAuZGF0YS1ncmlkIHRkIHsK ICAgICB2ZXJ0aWNhbC1hbGlnbjogdG9wOwogICAgIGhlaWdodDogMTJweDsKLSAgICBsaW5lLWhl aWdodDogMTJweDsKLSAgICBwYWRkaW5nOiAycHggNHB4OworICAgIGxpbmUtaGVpZ2h0OiAxN3B4 OworICAgIHBhZGRpbmc6IDJweCA2cHg7CiAgICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKICAgICBv dmVyZmxvdzogaGlkZGVuOwogfQogCi0uZGF0YS1ncmlkIHRkOmxhc3QtY2hpbGQgewotICAgIHBh ZGRpbmctcmlnaHQ6IDE2cHg7CisuZGF0YS1ncmlkOmZvY3VzIHRyLnNlbGVjdGVkIHRkOm5vdCg6 bGFzdC1jaGlsZCkgeworICAgIGJvcmRlci1yaWdodC1jb2xvcjogcmdiKDAsIDEwMiwgMjA0KTsK K30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kYXRhLWdyaWQ6Zm9jdXMgdHIuc2VsZWN0 ZWQgdGQ6bm90KDpsYXN0LWNoaWxkKSB7CisgICAgYm9yZGVyLXJpZ2h0LWNvbG9yOiByZ2IoNTMs IDEwOSwgMTg5KTsKIH0KIAotLmRhdGEtZ3JpZCB0ZCA+IGRpdiwgLmRhdGEtZ3JpZCB0aCA+IGRp diB7CisuZGF0YS1ncmlkIDotd2Via2l0LWFueSh0aCwgdGQpID4gZGl2IHsKICAgICB3aGl0ZS1z cGFjZTogbm93cmFwOwogICAgIHRleHQtb3ZlcmZsb3c6IGVsbGlwc2lzOwogICAgIG92ZXJmbG93 OiBoaWRkZW47CkBAIC0xNzksNjggKzE2OCwxMyBAQCBib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kg LmRhdGEtZ3JpZCB0aCB7CiAgICAgcG9zaXRpb246IHJlbGF0aXZlOwogfQogCi0uZGF0YS1ncmlk IHRoLnNvcnRhYmxlOm5vdCgubW91c2Utb3Zlci1jb2xsYXBzZXIpOmFjdGl2ZSB7Ci0gICAgYmFj a2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiYSgwLCAwLCAwLCAw LjMpLCByZ2JhKDAsIDAsIDAsIDAuMykpLCBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2Jh KDAsIDAsIDAsIDAuMyksIHJnYmEoMCwgMCwgMCwgMC4zKSksCi0gICAgICAgIGxpbmVhci1ncmFk aWVudCh0byBib3R0b20sIHJnYigyMjQsIDIyNCwgMjI0KSwgcmdiKDIyNCwgMjI0LCAyMjQpIDI1 JSwgcmdiKDIxNCwgMjE0LCAyMTQpIDUwJSwgcmdiKDIwNywgMjA3LCAyMDcpIDUwJSwgcmdiKDIw OCwgMjA4LCAyMDgpKTsKLSAgICBiYWNrZ3JvdW5kLXNpemU6IDFweCAxNXB4LCAxcHggMTVweCwg MTAwJSAxMDAlOwotICAgIGJhY2tncm91bmQtcG9zaXRpb246IGxlZnQgdG9wLCByaWdodCB0b3As IGNlbnRlcjsKLQotICAgIGJveC1zaGFkb3c6IGluc2V0IHJnYmEoMjU1LCAyNTUsIDI1NSwgMC4x KSAwIC0xcHggMDsKLSAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDE2MCwgMTYwLCAx NjApOwotfQotCi0uZGF0YS1ncmlkIHRoLnNvcnQtYXNjZW5kaW5nLCAuZGF0YS1ncmlkIHRoLnNv cnQtZGVzY2VuZGluZyB7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50KHRv IGJvdHRvbSwgcmdiYSgwLCAwLCAxMjAsIDAuMiksIHJnYmEoMCwgMCwgMTIwLCAwLjIpKSwgbGlu ZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiYSgwLCAwLCAxMjAsIDAuMiksIHJnYmEoMCwgMCwg MTIwLCAwLjIpKSwKLSAgICAgICAgbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiKDE5OSwg MjI2LCAyNDYpLCByZ2IoMTY5LCAyMDksIDIzOSkgMjUlLCByZ2IoMTU4LCAyMDQsIDIzOSkgNTAl LCByZ2IoMTQyLCAxOTYsIDIzNykgNTAlLCByZ2IoMTg3LCAyMzAsIDI0NSkpOwotICAgIGJhY2tn cm91bmQtc2l6ZTogMXB4IDE1cHgsIDFweCAxNXB4LCAxMDAlIDEwMCU7Ci0gICAgYmFja2dyb3Vu ZC1wb3NpdGlvbjogbGVmdCB0b3AsIHJpZ2h0IHRvcCwgY2VudGVyOwotCi0gICAgYm94LXNoYWRv dzogaW5zZXQgcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjEpIDAgLTFweCAwOwotICAgIGJvcmRlci1i b3R0b206IDFweCBzb2xpZCByZ2IoMTMwLCAxNzksIDIxMCk7Ci19Ci0KLS5kYXRhLWdyaWQgdGgu c29ydGFibGUuc29ydC1hc2NlbmRpbmc6bm90KC5tb3VzZS1vdmVyLWNvbGxhcHNlcik6YWN0aXZl LCAuZGF0YS1ncmlkIHRoLnNvcnRhYmxlLnNvcnQtZGVzY2VuZGluZzpub3QoLm1vdXNlLW92ZXIt Y29sbGFwc2VyKTphY3RpdmUgewotICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVu dCh0byBib3R0b20sIHJnYmEoMCwgMCwgMTIwLCAwLjIpLCByZ2JhKDAsIDAsIDEyMCwgMC4yKSks IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYmEoMCwgMCwgMTIwLCAwLjIpLCByZ2JhKDAs IDAsIDEyMCwgMC4yKSksCi0gICAgICAgIGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYigx NDQsIDE4MCwgMjI3KSwgcmdiKDEwOSwgMTYwLCAyMjApIDI1JSwgcmdiKDk2LCAxNTUsIDIyMSkg NTAlLCByZ2IoNzcsIDE0NiwgMjE5KSA1MCUsIHJnYigxMzAsIDE4NiwgMjI3KSk7Ci0gICAgYmFj a2dyb3VuZC1zaXplOiAxcHggMTVweCwgMXB4IDE1cHgsIDEwMCUgMTAwJTsKLSAgICBiYWNrZ3Jv dW5kLXBvc2l0aW9uOiBsZWZ0IHRvcCwgcmlnaHQgdG9wLCBjZW50ZXI7Ci0KLSAgICBib3JkZXIt Ym90dG9tOiAxcHggc29saWQgcmdiKDYzLCAxMjUsIDE5Mik7Ci19Ci0KLS5kYXRhLWdyaWQgdGg6 YWN0aXZlICsgdGgsCi0uZGF0YS1ncmlkIHRoLnNvcnQtYXNjZW5kaW5nICsgdGgsCi0uZGF0YS1n cmlkIHRoLnNvcnQtZGVzY2VuZGluZyArIHRoIHsKLSAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiAt MXB4IDJweCwgLTFweCAycHgsIGNlbnRlcjsKLX0KLQotLmRhdGEtZ3JpZCB0aDphY3RpdmUgKyB0 aC5zb3J0LWFzY2VuZGluZywKLS5kYXRhLWdyaWQgdGg6YWN0aXZlICsgdGguc29ydC1kZXNjZW5k aW5nLAotLmRhdGEtZ3JpZCB0aC5zb3J0LWFzY2VuZGluZyArIHRoOmFjdGl2ZSwKLS5kYXRhLWdy aWQgdGguc29ydC1kZXNjZW5kaW5nICsgdGg6YWN0aXZlIHsKLSAgICBiYWNrZ3JvdW5kLXBvc2l0 aW9uOiAtMXB4IHRvcCwgcmlnaHQgdG9wLCBjZW50ZXI7Ci19Ci0KLS5kYXRhLWdyaWQgdGg6Zmly c3QtY2hpbGQ6YWN0aXZlLAotLmRhdGEtZ3JpZCB0aC5zb3J0LWFzY2VuZGluZzpmaXJzdC1jaGls ZCwKLS5kYXRhLWdyaWQgdGguc29ydC1kZXNjZW5kaW5nOmZpcnN0LWNoaWxkIHsKLSAgICBiYWNr Z3JvdW5kLXBvc2l0aW9uOiAtMXB4IHRvcCwgcmlnaHQgdG9wLCBjZW50ZXIgIWltcG9ydGFudDsK LX0KLQotLmRhdGEtZ3JpZCB0aDpsYXN0LWNoaWxkOmFjdGl2ZSwKLS5kYXRhLWdyaWQgdGguc29y dC1hc2NlbmRpbmc6bGFzdC1jaGlsZCwKLS5kYXRhLWdyaWQgdGguc29ydC1kZXNjZW5kaW5nOmxh c3QtY2hpbGQgewotICAgIGJhY2tncm91bmQtcG9zaXRpb246IGxlZnQgdG9wLCAtMXB4IHRvcCwg Y2VudGVyICFpbXBvcnRhbnQ7Ci19Ci0KLS5kYXRhLWdyaWQgdGguc29ydC1hc2NlbmRpbmcgPiBk aXY6Zmlyc3QtY2hpbGQsCi0uZGF0YS1ncmlkIHRoLnNvcnQtZGVzY2VuZGluZyA+IGRpdjpmaXJz dC1jaGlsZCB7Ci0gICAgcGFkZGluZy1yaWdodDogMTBweDsKKy5kYXRhLWdyaWQgdGg6LXdlYmtp dC1hbnkoLnNvcnQtYXNjZW5kaW5nLCAuc29ydC1kZXNjZW5kaW5nKSA+IGRpdjpmaXJzdC1jaGls ZCB7CisgICAgcGFkZGluZy1yaWdodDogMTJweDsKIH0KIAogLmRhdGEtZ3JpZCB0aC5zb3J0LWFz Y2VuZGluZyA+IGRpdjpmaXJzdC1jaGlsZDo6YWZ0ZXIgewogICAgIHBvc2l0aW9uOiBhYnNvbHV0 ZTsKLSAgICB0b3A6IDA7CisgICAgdG9wOiAxcHg7CiAgICAgYm90dG9tOiAwOwogICAgIHJpZ2h0 OiAwOwogCkBAIC0yNTksNyArMTkzLDcgQEAgYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kYXRh LWdyaWQgdGggewogCiAuZGF0YS1ncmlkIHRoLnNvcnQtZGVzY2VuZGluZyA+IGRpdjpmaXJzdC1j aGlsZDo6YWZ0ZXIgewogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKLSAgICB0b3A6IDA7CisgICAg dG9wOiAxcHg7CiAgICAgYm90dG9tOiAwOwogICAgIHJpZ2h0OiAwOwogCkBAIC0yODAsMTYgKzIx NCw2IEBAIGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGF0YS1ncmlkIHRoIHsKICAgICBsaW5l LWhlaWdodDogMTlweDsKIH0KIAotYm9keS53aW5kb3ctaW5hY3RpdmUgLmRhdGEtZ3JpZCB0aC5z b3J0LWFzY2VuZGluZywKLWJvZHkud2luZG93LWluYWN0aXZlIC5kYXRhLWdyaWQgdGguc29ydC1k ZXNjZW5kaW5nIHsKLSAgICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90 dG9tLCB3aGl0ZSwgd2hpdGUgMjUlLCByZ2IoMjQ0LCAyNDQsIDI0NCkgNTAlLCByZ2IoMjM2LCAy MzYsIDIzNikgNTAlLCByZ2IoMjM3LCAyMzcsIDIzNykpLAotICAgICAgICBsaW5lYXItZ3JhZGll bnQodG8gYm90dG9tLCByZ2JhKDAsIDAsIDAsIDAuMiksIHJnYmEoMCwgMCwgMCwgMC4yKSk7Ci0g ICAgYmFja2dyb3VuZC1zaXplOiAxMDAlIDEwMCUsIDFweCAxMXB4OwotICAgIGJhY2tncm91bmQt cG9zaXRpb246IGNlbnRlciwgcmlnaHQgY2VudGVyOwotICAgIGJhY2tncm91bmQtcmVwZWF0OiBu by1yZXBlYXQ7Ci0gICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYigxODIsIDE4MiwgMTgy KTsKLX0KLQogLmRhdGEtZ3JpZCB0ci5wYXJlbnQgdGQuZGlzY2xvc3VyZTo6YmVmb3JlIHsKICAg ICBmbG9hdDogbGVmdDsKIApAQCAtMzM2LDYgKzI2MCw0OCBAQCBib2R5Lm1hYy1wbGF0Zm9ybS5s ZWdhY3kgLmRhdGEtZ3JpZDpmb2N1cyB0ci5zZWxlY3RlZCB7CiAgICAgdGV4dC1pbmRlbnQ6IDEw cHg7CiB9CiAKKy5kYXRhLWdyaWQgdGQgLnN1YnRpdGxlIHsKKyAgICBjb2xvcjogcmdiYSgwLCAw LCAwLCAwLjcpOworfQorCisuZGF0YS1ncmlkIHRkIC5zdWJ0aXRsZTo6YmVmb3JlIHsKKyAgICBj b250ZW50OiAiIOKAlCAiOworfQorCisuZGF0YS1ncmlkOmZvY3VzIHRyLnNlbGVjdGVkIHRkIC5z dWJ0aXRsZSB7CisgICAgY29sb3I6IHJnYmEoMjU1LCAyNTUsIDI1NSwgMC45KTsKK30KKworLmRh dGEtZ3JpZCB0ZC5lcnJvciB7CisgICAgY29sb3I6IHJnYigyMjQsIDE2LCAxNik7Cit9CisKKy5k YXRhLWdyaWQgdHIuc2VsZWN0ZWQgdGQuZXJyb3IgeworICAgIGNvbG9yOiBpbmhlcml0OworfQor CisuZGF0YS1ncmlkIHRkIC5pY29uIHsKKyAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7CisgICAg dmVydGljYWwtYWxpZ246IHRvcDsKKworICAgIHdpZHRoOiAxNnB4OworICAgIGhlaWdodDogMTZw eDsKKworICAgIG1hcmdpbi1yaWdodDogMnB4OworfQorCisuZGF0YS1ncmlkIHRkIC5nby10by1h cnJvdyB7CisgICAgZmxvYXQ6IHJpZ2h0OworCisgICAgZGlzcGxheTogbm9uZTsKKworICAgIG1h cmdpbi1sZWZ0OiAycHg7Cit9CisKKy5kYXRhLWdyaWQgdHI6LXdlYmtpdC1hbnkoLnNlbGVjdGVk LCA6aG92ZXIpIC5nby10by1hcnJvdyB7CisgICAgZGlzcGxheTogYmxvY2s7Cit9CisKIC5kYXRh LWdyaWQtcmVzaXplciB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIHRvcDogMDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFi YXNlQ29udGVudFZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRGF0YWJhc2VDb250ZW50Vmlldy5jc3MKaW5kZXggZTM5YWU2YjZkMzU3MzIxZjkzYTk4 ODdhMzI2YTY4ZWY3OTNiOGE3Yi4uMDU3ODYzZTE1ZTI4OGRkZTE4ZjdmZGY4MjJiNzdmZTMzNThj M2Q3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRGF0YWJhc2VDb250ZW50Vmlldy5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJhc2VDb250ZW50Vmlldy5jc3MKQEAgLTI0LDEzICsyNCwx MCBAQAogICovCiAKIC5zdG9yYWdlLXZpZXcgeyAgICAKLSAgICAvKiBBZGRlZCBzbyBmb250cyBs b29rIGdvb2QgKi8KICAgICBmb250LWZhbWlseTogTWVubG8sIG1vbm9zcGFjZTsKLSAgICBmb250 LXNpemU6IDExcHg7CiB9CiAKIC5zdG9yYWdlLXZpZXcgLmRhdGEtZ3JpZCB7Ci0gICAgYm9yZGVy OiBub25lOwogICAgIGhlaWdodDogMTAwJTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJhc2VUYWJsZUNvbnRlbnRWaWV3LmNz cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFiYXNlVGFi bGVDb250ZW50Vmlldy5jc3MKaW5kZXggYjI1YTY3MzkwNGFhNTQ3MTY2YTYxOGQwZmE3ZDFmYWMx MWJlMzJiYy4uOTEyOTNmMDFmYmFjZWNmMTliOGE3ZGJjOWE3ZGE2ZjY0MzM2YWIxNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJhc2VU YWJsZUNvbnRlbnRWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9EYXRhYmFzZVRhYmxlQ29udGVudFZpZXcuY3NzCkBAIC0yOSw1ICsyOSw0IEBA CiAgICAgbGVmdDogMDsKICAgICByaWdodDogMDsKICAgICBib3R0b206IDA7Ci0gICAgYm9yZGVy OiBub25lOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uY3NzCmluZGV4IDgzNGJjN2RlM2MzMDRkOWYz MmFjZjIzMGQzMTQwMzMzNDk4MDVkNTEuLjczYTEwYjVmM2ZiNTg5YjFlODBhZjZlZjlkNGYwNzA3 YmVkOGE3NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3MKQEAgLTI5Miw3ICsyOTIsOSBAQCBi b2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdy b3VwOmxhc3QtY2hpbGQgPiAucm93LgogfQogCiAuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQg LmRhdGEtZ3JpZCB7Ci0gICAgYm9yZGVyOiBub25lOworICAgIGJvcmRlci1sZWZ0OiBub25lOwor ICAgIGJvcmRlci1yaWdodDogbm9uZTsKKyAgICBib3JkZXItYm90dG9tOiBub25lOwogfQogCiAu ZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgLmRhdGEtZ3JpZCB0YWJsZS5kYXRhIHsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWRE YXRhYmFzZU9iamVjdFN0b3JlQ29udGVudFZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvSW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVDb250ZW50Vmll dy5jc3MKaW5kZXggNGUwOGZhMzZjMjAwMzBlYjAyNzUzN2Q3YjJkZDk5NjJlOGU4MTI3Ny4uMjYz ODFlMmQ1Y2NkYmQwODJkNDk1ZTM0ZGUzOThjYjdmZDNmNjM2NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW5kZXhlZERhdGFiYXNlT2JqZWN0 U3RvcmVDb250ZW50Vmlldy5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvSW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVDb250ZW50Vmlldy5jc3MKQEAg LTI5LDcgKzI5LDYgQEAKICAgICBsZWZ0OiAwOwogICAgIHJpZ2h0OiAwOwogICAgIGJvdHRvbTog MDsKLSAgICBib3JkZXI6IG5vbmU7CiB9CiAKIC5jb250ZW50LXZpZXcuaW5kZXhlZC1kYXRhYmFz ZS1vYmplY3Qtc3RvcmUgPiAuZGF0YS1ncmlkIHRkIC5zZWN0aW9uIC5oZWFkZXIgewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVl RGF0YUdyaWROb2RlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTGF5ZXJUcmVlRGF0YUdyaWROb2RlLmpzCmluZGV4IDgyNTM4ZWNmN2ZmYjI3ZTg3OGNhYjAw OGRmMGU5NmRkZDJjYTJlZWMuLjRmOTM4YTNkNjg5MGJmNmVjZDRhZTc0NzdhYWIyYWQ5NDBjMjg5 NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0xheWVyVHJlZURhdGFHcmlkTm9kZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVEYXRhR3JpZE5vZGUuanMKQEAgLTEwMSw3ICsxMDEs MTAgQEAgV2ViSW5zcGVjdG9yLkxheWVyVHJlZURhdGFHcmlkTm9kZS5wcm90b3R5cGUgPSB7CiAK ICAgICAgICAgZnJhZ21lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW1n IikpLmNsYXNzTmFtZSA9ICJpY29uIjsKIAotICAgICAgICB2YXIgbGFiZWwgPSB0aGlzLl9tYWtl T3V0bGV0KCJsYWJlbCIsIGZyYWdtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImRpdiIpKSk7CisgICAgICAgIHZhciBnb1RvQnV0dG9uID0gdGhpcy5fbWFrZU91dGxldCgi Z29Ub0J1dHRvbiIsIGZyYWdtZW50LmFwcGVuZENoaWxkKFdlYkluc3BlY3Rvci5jcmVhdGVHb1Rv QXJyb3dCdXR0b24oKSkpOworICAgICAgICBnb1RvQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNs aWNrIiwgdGhpcy5fZ29Ub0Fycm93V2FzQ2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7CisKKyAg ICAgICAgdmFyIGxhYmVsID0gdGhpcy5fbWFrZU91dGxldCgibGFiZWwiLCBmcmFnbWVudC5hcHBl bmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIikpKTsKICAgICAgICAgbGFiZWwu Y2xhc3NOYW1lID0gImxhYmVsIjsKICAgICAKICAgICAgICAgdmFyIG5hbWVMYWJlbCA9IHRoaXMu X21ha2VPdXRsZXQoIm5hbWVMYWJlbCIsIGxhYmVsLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoInNwYW4iKSkpOwpAQCAtMTE0LDkgKzExNyw2IEBAIFdlYkluc3BlY3Rvci5MYXll clRyZWVEYXRhR3JpZE5vZGUucHJvdG90eXBlID0gewogICAgICAgICByZWZsZWN0aW9uTGFiZWwu Y2xhc3NOYW1lID0gInJlZmxlY3Rpb24iOwogICAgICAgICByZWZsZWN0aW9uTGFiZWwudGV4dENv bnRlbnQgPSAiIFx1MjAxNCAiICsgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZWZsZWN0aW9uIik7 CiAKLSAgICAgICAgdmFyIGdvVG9CdXR0b24gPSB0aGlzLl9tYWtlT3V0bGV0KCJnb1RvQnV0dG9u IiwgZnJhZ21lbnQuYXBwZW5kQ2hpbGQoV2ViSW5zcGVjdG9yLmNyZWF0ZUdvVG9BcnJvd0J1dHRv bigpKSk7Ci0gICAgICAgIGdvVG9CdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlz Ll9nb1RvQXJyb3dXYXNDbGlja2VkLmJpbmQodGhpcyksIGZhbHNlKTsKLSAgICAgICAgCiAgICAg ICAgIHJldHVybiBmcmFnbWVudDsKICAgICB9LAogCkBAIC0xMzYsNiArMTM2LDExIEBAIFdlYklu c3BlY3Rvci5MYXllclRyZWVEYXRhR3JpZE5vZGUucHJvdG90eXBlID0gewogCiAgICAgICAgIHRo aXMuX291dGxldHMubmFtZUxhYmVsLnRleHRDb250ZW50ID0gZGF0YTsKIAorICAgICAgICBpZiAo V2ViSW5zcGVjdG9yLmRvbVRyZWVNYW5hZ2VyLm5vZGVGb3JJZChsYXllci5ub2RlSWQpKQorICAg ICAgICAgICAgbGFiZWwucGFyZW50Tm9kZS5pbnNlcnRCZWZvcmUodGhpcy5fb3V0bGV0cy5nb1Rv QnV0dG9uLCBsYWJlbC5wYXJlbnROb2RlLmZpcnN0Q2hpbGQpOworICAgICAgICBlbHNlIGlmICh0 aGlzLl9vdXRsZXRzLmdvVG9CdXR0b24ucGFyZW50Tm9kZSkKKyAgICAgICAgICAgIGxhYmVsLnBh cmVudE5vZGUucmVtb3ZlQ2hpbGQodGhpcy5fb3V0bGV0cy5nb1RvQnV0dG9uKTsKKwogICAgICAg ICBpZiAobGF5ZXIucHNldWRvRWxlbWVudCkKICAgICAgICAgICAgIGxhYmVsLmFwcGVuZENoaWxk KHRoaXMuX291dGxldHMucHNldWRvTGFiZWwpLnRleHRDb250ZW50ID0gIjo6IiArIGxheWVyLnBz ZXVkb0VsZW1lbnQ7CiAgICAgICAgIGVsc2UgaWYgKHRoaXMuX291dGxldHMucHNldWRvTGFiZWwu cGFyZW50Tm9kZSkKQEAgLTE0NiwxMSArMTUxLDYgQEAgV2ViSW5zcGVjdG9yLkxheWVyVHJlZURh dGFHcmlkTm9kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGVsc2UgaWYgKHRoaXMuX291dGxldHMu cmVmbGVjdGlvbkxhYmVsLnBhcmVudE5vZGUpCiAgICAgICAgICAgICBsYWJlbC5yZW1vdmVDaGls ZCh0aGlzLl9vdXRsZXRzLnJlZmxlY3Rpb25MYWJlbCk7CiAKLSAgICAgICAgaWYgKFdlYkluc3Bl Y3Rvci5kb21UcmVlTWFuYWdlci5ub2RlRm9ySWQobGF5ZXIubm9kZUlkKSkKLSAgICAgICAgICAg IGxhYmVsLnBhcmVudE5vZGUuYXBwZW5kQ2hpbGQodGhpcy5fb3V0bGV0cy5nb1RvQnV0dG9uKTsK LSAgICAgICAgZWxzZSBpZiAodGhpcy5fb3V0bGV0cy5nb1RvQnV0dG9uLnBhcmVudE5vZGUpCi0g ICAgICAgICAgICBsYWJlbC5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKHRoaXMuX291dGxldHMuZ29U b0J1dHRvbik7Ci0KICAgICAgICAgdmFyIGVsZW1lbnQgPSB0aGlzLmVsZW1lbnQ7CiAgICAgICAg IGlmIChsYXllci5pc1JlZmxlY3Rpb24pCiAgICAgICAgICAgICBlbGVtZW50LmNsYXNzTGlzdC5h ZGQoInJlZmxlY3Rpb24iKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZVNpZGViYXJQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVTaWRlYmFyUGFuZWwuY3NzCmlu ZGV4IGNhMTAzMWM1NTUwODRmZDdjNWE1NTFhNjVkOGE1NDU1ZTEwZGZkMzcuLmYwMGVlZjc3NDUw ZDI4Mjc4OGE5ZGQ5ODExNjEzN2VlMmRlZjcwZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZVNpZGViYXJQYW5lbC5jc3MKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlU2lk ZWJhclBhbmVsLmNzcwpAQCAtMjMsMTk4ICsyMyw3NCBAQAogICogVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgogICovCiAKLQotLyogV2UgdXNlIGFuIGludGVybmFsIGNvbnRhaW5lciB0 byBhY3QgYXMgYSB2ZXJ0aWNhbCBzdGFjay4gKi8KLQotLmxheWVyLXRyZWUucGFuZWwgLmJveC1j b250YWluZXIgewotICAgIGhlaWdodDogMTAwJTsKLSAgICAvKiBMZXQgaXQgc3RhY2sgaXRzIGNv bnRlbnQgYXMgdmVydGljYWwgYm94ZXMuICovCi0gICAgZGlzcGxheTogLXdlYmtpdC1mbGV4Owot ICAgIC13ZWJraXQtZmxleC1kaXJlY3Rpb246IGNvbHVtbjsKLX0KLQotLyogSGlkZSB0aGUgY29s bGFwc2VkIGFycm93IGZyb20gc2VjdGlvbnMuICovCi0KLS5sYXllci10cmVlLnBhbmVsIC5kZXRh aWxzLXNlY3Rpb24gPiAuaGVhZGVyOjpiZWZvcmUgewotICAgIC8qIERvbid0IHNob3cgdGhlIGNv bGxwYXNlZCBhcnJvdy4gKi8KLSAgICBkaXNwbGF5OiBub25lOwotfQotCi0ubGF5ZXItdHJlZS5w YW5lbCAuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlciB7Ci0gICAgLyogQWRkIGEgbGl0dGxlIHBh ZGRpbmcgc2luY2UgdGhlcmUncyBubyBhcnJvdyB0byBzaG93LiAqLwotICAgIHBhZGRpbmctbGVm dDogNHB4OwotICAgIC8qIFR1cm4gb2ZmIG1vdXNlIGV2ZW50cyBzbyB3ZSBjYW4ndCBjbGljayB0 byB0b2dnbGUgc2VjdGlvbi4gKi8KLSAgICBwb2ludGVyLWV2ZW50czogbm9uZTsKLX0KLQotLmxh eWVyLXRyZWUucGFuZWwgLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgPiBsYWJlbCB7Ci0gICAg LyogQWx3YXlzIHNob3cgdGhlIG9wdGlvbnMgYm94LiAqLwotICAgIGRpc3BsYXk6IGJsb2NrICFp bXBvcnRhbnQ7Ci0gICAgLyogVHVybiBvbiBldmVudHMganVzdCBmb3IgdGhlIDxsYWJlbD4gYW5k IDxpbnB1dD4uICovCi0gICAgcG9pbnRlci1ldmVudHM6IGFsbDsKLX0KLQotLyogQ3VzdG9taXpp bmcgdGhlIERhdGFHcmlkLiAqLwotCi0ubGF5ZXItdHJlZS5wYW5lbCAuZGV0YWlscy1zZWN0aW9u LmxheWVyLWNoaWxkcmVuIHsKLSAgICBwb3NpdGlvbjogcmVsYXRpdmU7Ci0gICAgLyogVXNlIGFs bCBhdmFpbGFibGUgdmVydGljYWwgc3BhY2UuICovCi0gICAgLXdlYmtpdC1mbGV4OiAxOwotICAg IC8qIExldCBjaGlsZHJlbiBzdGFjayB2ZXJ0aWNhbGx5LiAqLwotICAgIGRpc3BsYXk6IC13ZWJr aXQtZmxleDsKLSAgICAtd2Via2l0LWZsZXgtZGlyZWN0aW9uOiBjb2x1bW47Ci19Ci0KLS5sYXll ci10cmVlLnBhbmVsIC5kZXRhaWxzLXNlY3Rpb24ubGF5ZXItY2hpbGRyZW4gPiAuY29udGVudCB7 Ci0gICAgcG9zaXRpb246IHJlbGF0aXZlOwotICAgIGRpc3BsYXk6IGJsb2NrOwotICAgIC8qIFVz ZSBhbGwgYXZhaWxhYmxlIHZlcnRpY2FsIHNwYWNlLiAqLwotICAgIC13ZWJraXQtZmxleDogMTsK LX0KLQotLmxheWVyLXRyZWUucGFuZWwgLmRldGFpbHMtc2VjdGlvbi5sYXllci1jaGlsZHJlbiAu Z3JvdXAgewotICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKLSAgICB3aWR0aDogMTAwJTsKLSAgICBo ZWlnaHQ6IDEwMCU7Ci19Ci0KIC5sYXllci10cmVlLnBhbmVsIC5kYXRhLWdyaWQgewotICAgIHBv c2l0aW9uOiByZWxhdGl2ZTsKLSAgICB0b3A6IDA7Ci0gICAgd2lkdGg6IDEwMCU7Ci0gICAgaGVp Z2h0OiAxMDAlOwotICAgIC8qIFR1cm4gb2ZmIHRoZSBkZWZhdWx0IGJvcmRlcnMsIHdlIHdhbnQg dG8gc25hcCB0byBlZGdlcy4gKi8KLSAgICBib3JkZXI6IG5vbmU7Ci19Ci0KLS5sYXllci10cmVl LnBhbmVsIC5kYXRhLWdyaWQgdGFibGUuZGF0YSB7Ci0gICAgYmFja2dyb3VuZC1zaXplOiAxMDAl IDQ0cHg7Ci19Ci0KLS5sYXllci10cmVlLnBhbmVsIC5kYXRhLWNvbnRhaW5lciB7Ci0gICAgcG9z aXRpb246IGFic29sdXRlOwotICAgIC8qIExlYXZlIHJvb20gZm9yIHRoZSBkYXRhIGdyaWQgaGVh ZGVyLiAqLwotICAgIHRvcDogMTZweDsKLSAgICAvKiBVc2UgYWxsIHJlbWFpbmluZyB2ZXJ0aWNh bCBzcGFjZSBpbiB0aGUgY29udGFpbmVyLiAqLwotICAgIGJvdHRvbTogMDsKLSAgICAvKiBMZXQg dGhlIGlubGluZSB0YWJsZSBjb250ZW50IHNjcm9sbCwgaW5kZXBlbmRlbnRseSBvZiB0aGUgaGVh ZGVyLiAqLwotICAgIG92ZXJmbG93LXk6IGF1dG87Ci0gICAgb3ZlcmZsb3cteDogaGlkZGVuOwot fQotCi0ubGF5ZXItdHJlZS5wYW5lbCAuZGF0YS1jb250YWluZXIgdHIgewotICAgIGhlaWdodDog MjJweDsKLX0KLQotLmxheWVyLXRyZWUucGFuZWwgLmRhdGEtY29udGFpbmVyIHRkID4gZGl2IHsK LSAgICBkaXNwbGF5OiAtd2Via2l0LWZsZXg7Ci0gICAgd2lkdGg6IDEwMCU7Ci0gICAgaGVpZ2h0 OiAxMDAlOwotICAgIC13ZWJraXQtYWxpZ24taXRlbXM6IGNlbnRlcjsKLSAgICAtd2Via2l0LWp1 c3RpZnktY29udGVudDogZmxleC1lbmQ7CisgICAgYm9yZGVyLXJpZ2h0OiBub25lOworICAgIGJv cmRlci1sZWZ0OiBub25lOworICAgIGJvcmRlci1ib3R0b206IG5vbmU7CiB9CiAKLS8qIEN1c3Rv bWl6aW5nIHRoZSBEYXRhR3JpZCAibm9kZSIgY2VsbC4gKi8KLQotLmxheWVyLXRyZWUucGFuZWwg LmRhdGEtY29udGFpbmVyIC5uYW1lLWNvbHVtbiB7Ci0gICAgcGFkZGluZy1yaWdodDogMDsKLX0K LQotLmxheWVyLXRyZWUucGFuZWwgLmRhdGEtY29udGFpbmVyIC5uYW1lLWNvbHVtbiAuaWNvbiB7 Ci0gICAgdmVydGljYWwtYWxpZ246IHRvcDsKLSAgICB3aWR0aDogMTZweDsKLSAgICBoZWlnaHQ6 IDE2cHg7CisubGF5ZXItdHJlZS5wYW5lbCAubmFtZS1jb2x1bW4gLmljb24gewogICAgIGNvbnRl bnQ6IHVybCguLi9JbWFnZXMvRE9NRWxlbWVudC5zdmcpOwogfQogCi0ubGF5ZXItdHJlZS5wYW5l bCAuZGF0YS1jb250YWluZXIgdHIucmVmbGVjdGlvbiAubmFtZS1jb2x1bW4gLmljb24geworLmxh eWVyLXRyZWUucGFuZWwgdHIucmVmbGVjdGlvbiAubmFtZS1jb2x1bW4gLmljb24gewogICAgIGNv bnRlbnQ6IHVybCguLi9JbWFnZXMvUmVmbGVjdGlvbi5zdmcpOwogfQogCi0ubGF5ZXItdHJlZS5w YW5lbCAuZGF0YS1jb250YWluZXIgdHIucHNldWRvLWVsZW1lbnQgLm5hbWUtY29sdW1uIC5pY29u IHsKKy5sYXllci10cmVlLnBhbmVsIHRyLnBzZXVkby1lbGVtZW50IC5uYW1lLWNvbHVtbiAuaWNv biB7CiAgICAgY29udGVudDogdXJsKC4uL0ltYWdlcy9Qc2V1ZG9FbGVtZW50LnN2Zyk7CiB9CiAK LS5sYXllci10cmVlLnBhbmVsIC5kYXRhLWNvbnRhaW5lciAubmFtZS1jb2x1bW4gLmxhYmVsIHsK LSAgICAtd2Via2l0LWZsZXg6IDE7Ci0gICAgcGFkZGluZzogMCA0cHg7Ci0KLSAgICB3aGl0ZS1z cGFjZTogbm93cmFwOwotICAgIG92ZXJmbG93OiBoaWRkZW47Ci0gICAgdGV4dC1vdmVyZmxvdzog ZWxsaXBzaXM7Ci19Ci0KLS5sYXllci10cmVlLnBhbmVsIC5kYXRhLWNvbnRhaW5lciB0cjpob3Zl ciAubmFtZS1jb2x1bW4gLmxhYmVsIHsKLSAgICBwYWRkaW5nLXJpZ2h0OiAwOwotfQotCi0ubGF5 ZXItdHJlZS5wYW5lbCAuZGF0YS1jb250YWluZXIgLm5hbWUtY29sdW1uIC5wc2V1ZG8tZWxlbWVu dCwKLS5sYXllci10cmVlLnBhbmVsIC5kYXRhLWNvbnRhaW5lciAubmFtZS1jb2x1bW4gLnJlZmxl Y3Rpb24geworLmxheWVyLXRyZWUucGFuZWwgLm5hbWUtY29sdW1uIC5wc2V1ZG8tZWxlbWVudCwK Ky5sYXllci10cmVlLnBhbmVsIC5uYW1lLWNvbHVtbiAucmVmbGVjdGlvbiB7CiAgICAgY29sb3I6 IHJnYigxMjgsIDEyOCwgMTI4KTsKIH0KIAotLmxheWVyLXRyZWUucGFuZWwgLmRhdGEtY29udGFp bmVyIHRyLnNlbGVjdGVkIC5uYW1lLWNvbHVtbiAucHNldWRvLWVsZW1lbnQsCi0ubGF5ZXItdHJl ZS5wYW5lbCAuZGF0YS1jb250YWluZXIgdHIuc2VsZWN0ZWQgLm5hbWUtY29sdW1uIC5yZWZsZWN0 aW9uIHsKKy5sYXllci10cmVlLnBhbmVsIHRyLnNlbGVjdGVkIC5uYW1lLWNvbHVtbiAucHNldWRv LWVsZW1lbnQsCisubGF5ZXItdHJlZS5wYW5lbCB0ci5zZWxlY3RlZCAubmFtZS1jb2x1bW4gLnJl ZmxlY3Rpb24gewogICAgIGNvbG9yOiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAuNzUpOwogfQogCi0u bGF5ZXItdHJlZS5wYW5lbCAuZGF0YS1jb250YWluZXIgLmdvLXRvLWFycm93IHsKLSAgICBkaXNw bGF5OiBub25lOwotfQotCi0ubGF5ZXItdHJlZS5wYW5lbCAuZGF0YS1jb250YWluZXIgdHI6aG92 ZXIgLmdvLXRvLWFycm93IHsKLSAgICBkaXNwbGF5OiBibG9jazsKLX0KLQotLmxheWVyLXRyZWUu cGFuZWwgLmRhdGEtY29udGFpbmVyIHRib2R5ID4gdHIuZXZlbiB7Ci0gICAgYmFja2dyb3VuZC1j b2xvcjogd2hpdGU7Ci19Ci0KLS5sYXllci10cmVlLnBhbmVsIC5kYXRhLWNvbnRhaW5lciB0Ym9k eSA+IHRyLm9kZCB7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDI0MywgMjQ2LCAyNTApOwot fQotCi0vKiBCb3R0b20gYmFyICovCi0KIC5sYXllci10cmVlLnBhbmVsIC5ib3R0b20tYmFyIHsK ICAgICBwb3NpdGlvbjogcmVsYXRpdmU7Ci0gICAgaGVpZ2h0OiAyMnB4OwotICAgIC8qIExldCBp dCBzdGFjayBpdHMgY29udGVudCBhcyBob3Jpem9udGFsIGJveGVzLiAqLworICAgIGhlaWdodDog MjhweDsKICAgICBkaXNwbGF5OiAtd2Via2l0LWZsZXg7CiB9CiAKK2JvZHkubWFjLXBsYXRmb3Jt LmxlZ2FjeSAubGF5ZXItdHJlZS5wYW5lbCAuYm90dG9tLWJhciB7CisgICAgaGVpZ2h0OiAyMnB4 OworfQorCiAubGF5ZXItdHJlZS5wYW5lbCAuYm90dG9tLWJhciA+IGRpdiB7Ci0gICAgcGFkZGlu ZzogNHB4OwotICAgIGJveC1zaXppbmc6IGJvcmRlci1ib3g7CisgICAgcGFkZGluZzogNHB4IDZw eDsKIAotICAgIGZvbnQtZmFtaWx5OiAnTHVjaWRhIEdyYW5kZScsIHNhbnMtc2VyaWY7Ci0gICAg Zm9udC1zaXplOiAxMXB4OwotICAgIHRleHQtc2hhZG93OiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAu NSkgMCAxcHggMDsKKyAgICBsaW5lLWhlaWdodDogMjBweDsKIAotICAgIC8qIEVuc3VyZSBhbnkg b3ZlcmZsb3dpbmcgdGV4dCBpcyB0cmltbWVkLiAqLwogICAgIHdoaXRlLXNwYWNlOiBub3dyYXA7 CiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKICAgICB0ZXh0LW92ZXJmbG93OiBlbGxpcHNpczsKIAot ICAgIC8qIExldCBhbGwgYm94ZXMgaGF2ZSB0aGUgc2FtZSB3aWR0aC4gKi8KICAgICBkaXNwbGF5 OiAtd2Via2l0LWZsZXg7CiAgICAgLXdlYmtpdC1mbGV4OiAxOwogfQogCitib2R5Lm1hYy1wbGF0 Zm9ybS5sZWdhY3kgLmxheWVyLXRyZWUucGFuZWwgLmJvdHRvbS1iYXIgPiBkaXYgeworICAgIGxp bmUtaGVpZ2h0OiBpbmhlcml0OworICAgIHRleHQtc2hhZG93OiByZ2JhKDI1NSwgMjU1LCAyNTUs IDAuNSkgMCAxcHggMDsKK30KKwogLmxheWVyLXRyZWUucGFuZWwgLmxheWVycy1tZW1vcnktbGFi ZWwgewogICAgIC13ZWJraXQtanVzdGlmeS1jb250ZW50OiBmbGV4LWVuZDsKIH0KIAotLyogcG9w b3ZlciAqLwotCiAubGF5ZXItdHJlZS1wb3BvdmVyIHsKLSAgICBmb250LWZhbWlseTogJ0x1Y2lk YSBHcmFuZGUnLCBzYW5zLXNlcmlmOwotICAgIGZvbnQtc2l6ZTogMTFweDsKLSAgICB0ZXh0LXNo YWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjUpIDAgMXB4IDA7Ci0KICAgICBwYWRkaW5nOiA1 cHg7CiB9CiAKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAubGF5ZXItdHJlZS1wb3BvdmVyIHsK KyAgICB0ZXh0LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjUpIDAgMXB4IDA7Cit9CisK IC5sYXllci10cmVlLXBvcG92ZXIgcCB7CiAgICAgbWFyZ2luOiAwOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlU2lkZWJh clBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5 ZXJUcmVlU2lkZWJhclBhbmVsLmpzCmluZGV4IGI1ZDFlYWVkZTM0NGU1MWI2OWQxMWEwZTJkZjgy NmQyNTYxYzlhM2YuLjNhNDU4YzlmMjZlMjU0Mjc5MmM2MmEwY2NmZGRmY2M5ZDA1MDg1OTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVy VHJlZVNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9MYXllclRyZWVTaWRlYmFyUGFuZWwuanMKQEAgLTM0LDEwICszNCw2IEBAIFdl Ykluc3BlY3Rvci5MYXllclRyZWVTaWRlYmFyUGFuZWwgPSBmdW5jdGlvbigpIHsKIAogICAgIHdp bmRvdy5hZGRFdmVudExpc3RlbmVyKCJyZXNpemUiLCB0aGlzLl93aW5kb3dSZXNpemVkLmJpbmQo dGhpcykpOwogCi0gICAgLy8gQWRkIGEgY29udGFpbmVyIHRoYXQgd2lsbCBob3N0IGFsbCBzZWN0 aW9ucyBhcyBhIHZlcnRpY2FsIHN0YWNrLgotICAgIHRoaXMuX2NvbnRhaW5lciA9IHRoaXMuZWxl bWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7Ci0gICAgdGhp cy5fY29udGFpbmVyLmNsYXNzTmFtZSA9ICJib3gtY29udGFpbmVyIjsKLQogICAgIHRoaXMuX2J1 aWxkTGF5ZXJJbmZvU2VjdGlvbigpOwogICAgIHRoaXMuX2J1aWxkRGF0YUdyaWRTZWN0aW9uKCk7 CiAgICAgdGhpcy5fYnVpbGRCb3R0b21CYXIoKTsKQEAgLTEyMyw3ICsxMTksNyBAQCBXZWJJbnNw ZWN0b3IuTGF5ZXJUcmVlU2lkZWJhclBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlz Ll9sYXllckluZm9TZWN0aW9uID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvbigibGF5 ZXItaW5mbyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiTGF5ZXIgSW5mbyIpLCBbdGhpcy5fbm9M YXllckluZm9ybWF0aW9uR3JvdXBdKTsKIAotICAgICAgICB0aGlzLl9jb250YWluZXIuYXBwZW5k Q2hpbGQodGhpcy5fbGF5ZXJJbmZvU2VjdGlvbi5lbGVtZW50KTsKKyAgICAgICAgdGhpcy5lbGVt ZW50LmFwcGVuZENoaWxkKHRoaXMuX2xheWVySW5mb1NlY3Rpb24uZWxlbWVudCk7CiAgICAgfSwK IAogICAgIF9idWlsZERhdGFHcmlkU2VjdGlvbjogZnVuY3Rpb24oKQpAQCAtMTUxLDYgKzE0Nyw3 IEBAIFdlYkluc3BlY3Rvci5MYXllclRyZWVTaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogICAg ICAgICB0aGlzLnNvcnRPcmRlciA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuRGVz Y2VuZGluZzsKIAogICAgICAgICB2YXIgZWxlbWVudCA9IHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQ7 CisgICAgICAgIGVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiaW5saW5lIik7CiAgICAgICAgIGVsZW1l bnQuYWRkRXZlbnRMaXN0ZW5lcigiZm9jdXMiLCB0aGlzLl9kYXRhR3JpZEdhaW5lZEZvY3VzLmJp bmQodGhpcyksIGZhbHNlKTsKICAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJibHVy IiwgdGhpcy5fZGF0YUdyaWRMb3N0Rm9jdXMuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgICAgICBl bGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fZGF0YUdyaWRXYXNDbGlja2Vk LmJpbmQodGhpcyksIGZhbHNlKTsKQEAgLTE1OSwxNSArMTU2LDEzIEBAIFdlYkluc3BlY3Rvci5M YXllclRyZWVTaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB2YXIgZ3JvdXAgPSBu ZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uR3JvdXAoW3RoaXMuX2NoaWxkTGF5ZXJzUm93 XSk7CiAgICAgICAgIHZhciBzZWN0aW9uID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlv bigibGF5ZXItY2hpbGRyZW4iLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNoaWxkIExheWVycyIp LCBbZ3JvdXBdLCBudWxsLCB0cnVlKTsKIAotICAgICAgICAvLyBEaXNwbGF5IGl0IGluIHRoZSBj b250YWluZXIgd2l0aCBhIGNsYXNzIG5hbWUgc28gd2UgY2FuIGVhc2lseSBzdHlsZSBpdCBkaWZm ZXJlbnRseSB0byBvdGhlciBzZWN0aW9ucywKLSAgICAgICAgLy8gdGhpcyBzcGVjaWZpYyBzZWN0 aW9uIGlzIG1lYW50IHRvIHNjYWxlIHRvIGZpbGwgdGhlIHNwYWNlIGF2YWlsYWJsZSB2ZXJ0aWNh bGx5LgotICAgICAgICB2YXIgZWxlbWVudCA9IHRoaXMuX2NvbnRhaW5lci5hcHBlbmRDaGlsZChz ZWN0aW9uLmVsZW1lbnQpOworICAgICAgICB2YXIgZWxlbWVudCA9IHRoaXMuZWxlbWVudC5hcHBl bmRDaGlsZChzZWN0aW9uLmVsZW1lbnQpOwogICAgICAgICBlbGVtZW50LmNsYXNzTGlzdC5hZGQo c2VjdGlvbi5pZGVudGlmaWVyKTsKICAgICB9LAogCiAgICAgX2J1aWxkQm90dG9tQmFyOiBmdW5j dGlvbigpCiAgICAgewotICAgICAgICB2YXIgYm90dG9tQmFyID0gdGhpcy5fY29udGFpbmVyLmFw cGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpKTsKKyAgICAgICAgdmFyIGJv dHRvbUJhciA9IHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJkaXYiKSk7CiAgICAgICAgIGJvdHRvbUJhci5jbGFzc05hbWUgPSAiYm90dG9tLWJhciI7CiAK ICAgICAgICAgdGhpcy5fbGF5ZXJzQ291bnRMYWJlbCA9IGJvdHRvbUJhci5hcHBlbmRDaGlsZChk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7CkBAIC0zMjAsNyArMzE1LDcgQEAgV2ViSW5z cGVjdG9yLkxheWVyVHJlZVNpZGViYXJQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0 b3RhbE1lbW9yeSArPSBsYXllci5tZW1vcnkgfHwgMDsKICAgICAgICAgfSk7CiAKLSAgICAgICAg dGhpcy5fbGF5ZXJzQ291bnRMYWJlbC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiTGF5ZXIgY291bnQ6ICVkIikuZm9ybWF0KGxheWVyQ291bnQpOworICAgICAgICB0aGlzLl9s YXllcnNDb3VudExhYmVsLnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMYXll ciBDb3VudDogJWQiKS5mb3JtYXQobGF5ZXJDb3VudCk7CiAgICAgICAgIHRoaXMuX2xheWVyc01l bW9yeUxhYmVsLnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJNZW1vcnk6ICVz IikuZm9ybWF0KE51bWJlci5ieXRlc1RvU3RyaW5nKHRvdGFsTWVtb3J5KSk7CiAgICAgfSwKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGVn YWN5SmF2YVNjcmlwdFByb2ZpbGVWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0xlZ2FjeUphdmFTY3JpcHRQcm9maWxlVmlldy5jc3MKaW5kZXggOTQ4 ODljNTU2MzFjMjhmNDM5MmVhYjQxYWZlYTdiYzdiYzlkZDM4MC4uY2JmOThhMTdkOWIxNzc3YjE4 MWRmYjI2OTZiNWQ4MmMyOTQ3OGE2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvTGVnYWN5SmF2YVNjcmlwdFByb2ZpbGVWaWV3LmNzcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MZWdhY3lKYXZhU2Ny aXB0UHJvZmlsZVZpZXcuY3NzCkBAIC0yOSw4ICsyOSw2IEBACiAgICAgbGVmdDogMDsKICAgICBy aWdodDogMDsKICAgICBib3R0b206IDA7Ci0gICAgb3V0bGluZTogbm9uZTsKLSAgICBib3JkZXI6 IG5vbmU7CiB9CiAKIC5wcm9maWxlLXZpZXcgLmRhdGEtZ3JpZCB0aC5hdmVyYWdlLWNvbHVtbiB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9M ZWdhY3lQcm9maWxlVmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9MZWdhY3lQcm9maWxlVmlldy5jc3MKaW5kZXggNjRkN2FlNWNiMzMwNGM1ZDM2MDFi MTUxMDk2YmFmZGU4ZjJhNjNlMC4uMTRhMzYxZmYyOTU3NDQyZDE5NDA3NWY0MjFiNTYxMjBlYzYy MGJkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTGVnYWN5UHJvZmlsZVZpZXcuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0xlZ2FjeVByb2ZpbGVWaWV3LmNzcwpAQCAtNDUsNyArNDUsNiBAQAog fQogCiAucmVjb3JkaW5nLXByb2ZpbGUtdmlldyA+IHNwYW4gewotICAgIGZvbnQtZmFtaWx5OiAn THVjaWRhIEdyYW5kZScsIEhlbHZldGljYSwgc2Fucy1zZXJpZjsKICAgICBmb250LXNpemU6IDE0 cHg7CiAKICAgICB0ZXh0LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjUpIDAgMXB4IDA7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9M b2dDb250ZW50Vmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Mb2dDb250ZW50Vmlldy5jc3MKaW5kZXggMzc0MjE1MzliY2M2ZWE1OGM4M2IzMjYyMmM1 NTljMzMyNWM4NTE1MS4uNGJiYzZiYjI0YjIzOWE4M2E5Y2Q0NmJmY2ZlZjdjMTg5OTg0M2ExMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9n Q29udGVudFZpZXcuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmNzcwpAQCAtOTQsNyArOTQsNiBAQAogICAgIHRleHQtYWxp Z246IGxlZnQ7CiAgICAgZm9udC1zaXplOiAxMXB4OwogICAgIGxpbmUtaGVpZ2h0OiBub3JtYWw7 Ci0gICAgZm9udC1mYW1pbHk6IEhlbHZldGljYSwgQXJpYWwsIHNhbnMtc2VyaWY7CiAgICAgZm9u dC13ZWlnaHQ6IGJvbGQ7CiAgICAgdGV4dC1zaGFkb3c6IG5vbmU7CiAgICAgY29sb3I6IHdoaXRl OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TmV0d29ya1RpbWVsaW5lVmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmNzcwppbmRleCBhMzExODU2NjhlMzY5NmRh YjBhNWJlYTA1NDA5ODk3YThmMmQ1NzM2Li44MzI3M2Y3ODEyYTljMmE5MTU4YjE0NjcwMjQ5MDk4 OTMyODY1ZDA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmNzcwpAQCAtMjksNyAr MjksNiBAQAogICAgIGxlZnQ6IDA7CiAgICAgcmlnaHQ6IDA7CiAgICAgYm90dG9tOiAwOwotICAg IGJvcmRlcjogbm9uZTsKIH0KIAogLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi50aW1lbGlu ZS50aW1lbGluZS1jb250ZW50LXZpZXctc2hvd2luZyAubmF2aWdhdGlvbi1zaWRlYmFyLXBhbmVs LWNvbnRlbnQtdHJlZS1vdXRsaW5lLm5ldHdvcmsgLml0ZW0gLnN1YnRpdGxlIHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3VGlt ZWxpbmVWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L092ZXJ2aWV3VGltZWxpbmVWaWV3LmNzcwppbmRleCA1NjMwZjY5YTRmNjdhMzUzMWIxYjc4ZmM2 MWUyY2M5ZGU3ZTFhNjY1Li4zYTYxYzYyNjNhZTYyZmZjNGViMTE5MzhjOGI2YjQ1MzhkODE3NGIz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9P dmVydmlld1RpbWVsaW5lVmlldy5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvT3ZlcnZpZXdUaW1lbGluZVZpZXcuY3NzCkBAIC0zMiw3ICszMiw3IEBA CiB9CiAKIC50aW1lbGluZS12aWV3Lm92ZXJ2aWV3ID4gLnRpbWVsaW5lLXJ1bGVyID4gLmhlYWRl ciB7Ci0gICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHJnYigyMDAsIDIwMCwgMjAwKTsKKyAgICBi b3JkZXItdG9wOiAxcHggc29saWQgcmdiKDE3OSwgMTc5LCAxNzkpOwogICAgIGhlaWdodDogMjNw eDsKIH0KIApAQCAtNDYsMTUgKzQ2LDYgQEAKICAgICBsZWZ0OiAwOwogICAgIHJpZ2h0OiAwOwog ICAgIGJvdHRvbTogMDsKLSAgICBib3JkZXI6IG5vbmU7Ci19Ci0KLS50aW1lbGluZS12aWV3Lm92 ZXJ2aWV3ID4gLmRhdGEtZ3JpZCB0YWJsZS5oZWFkZXIgewotICAgIGRpc3BsYXk6IG5vbmU7Ci19 Ci0KLS50aW1lbGluZS12aWV3Lm92ZXJ2aWV3ID4gLmRhdGEtZ3JpZCAuZGF0YS1jb250YWluZXIg ewotICAgIHRvcDogMDsKIH0KIAogLnRpbWVsaW5lLXZpZXcub3ZlcnZpZXcgPiAuZGF0YS1ncmlk IHRkLmdyYXBoLWNvbHVtbiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9PdmVydmlld1RpbWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3VGltZWxpbmVWaWV3LmpzCmluZGV4 IGJmNGViMTBiNDFkNmFhNDczYmY4YWU5YjZmN2YzODhhM2MyYTkyZDUuLmI5MDI1Njk4NWM1Yzgx MjBhZjc0NmUyMzJlYzcyOGNkZWQ1ZDNhNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3VGltZWxpbmVWaWV3LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3VGltZWxpbmVW aWV3LmpzCkBAIC0zNSw2ICszNSw3IEBAIFdlYkluc3BlY3Rvci5PdmVydmlld1RpbWVsaW5lVmll dyA9IGZ1bmN0aW9uKHJlY29yZGluZykKIAogICAgIHRoaXMuX2RhdGFHcmlkID0gbmV3IFdlYklu c3BlY3Rvci5EYXRhR3JpZChjb2x1bW5zKTsKICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5TZWxlY3RlZE5vZGVDaGFuZ2VkLCB0 aGlzLl9kYXRhR3JpZE5vZGVTZWxlY3RlZCwgdGhpcyk7CisgICAgdGhpcy5fZGF0YUdyaWQuZWxl bWVudC5jbGFzc0xpc3QuYWRkKCJuby1oZWFkZXIiKTsKIAogICAgIHRoaXMuX3RyZWVPdXRsaW5l RGF0YUdyaWRTeW5jaHJvbml6ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lRGF0YUdy aWRTeW5jaHJvbml6ZXIodGhpcy5fY29udGVudFRyZWVPdXRsaW5lLCB0aGlzLl9kYXRhR3JpZCk7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Byb2JlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Qcm9iZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzCmluZGV4IDBiMWM5 ZDIwYThmY2RkMDBhOGNjYzUyMzQ1ZDU1NDQ0MDllYjJmNTUuLmE0NTE5MTdjOThmMGE5MTU2NDdk NmU3ZjAzNDljYzNlMDFmODFhYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Byb2JlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVEZXRhaWxzU2lkZWJh clBhbmVsLmNzcwpAQCAtNDQsNyArNDQsNiBAQAogICAgIGhlaWdodDogMTFweDsKICAgICBtYXJn aW4tdG9wOiAxcHg7CiAgICAgbWFyZ2luLWxlZnQ6IDVweDsKLSAgICBjdXJzb3I6IHBvaW50ZXI7 CiB9CiAKIC5kZXRhaWxzLXNlY3Rpb24ucHJvYmUtc2V0IC5vcHRpb25zID4gLnByb2JlLWNsZWFy LXNhbXBsZXMgewpAQCAtODgsNDYgKzg3LDggQEAgYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5k ZXRhaWxzLXNlY3Rpb24ucHJvYmUtc2V0IC5vcHRpb25zID4gLnByb2JlLWFkZCB7CiAgICAgZGlz cGxheTogYmxvY2s7CiB9CiAKLS5kZXRhaWxzLXNlY3Rpb24ucHJvYmUtc2V0IHsKLSAgICAtd2Vi a2l0LWZsZXg6IDE7Ci0gICAgbWFyZ2luLWJvdHRvbTogMCAhaW1wb3J0YW50OwotICAgIHBvc2l0 aW9uOiByZWxhdGl2ZTsKLX0KLQotLmRldGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQuY29sbGFwc2Vk ID4gLmNvbnRlbnQgewotICAgIGRpc3BsYXk6IG5vbmUgIWltcG9ydGFudDsKLX0KLQotLmRldGFp bHMtc2VjdGlvbi5wcm9iZS1zZXQuY29sbGFwc2VkIHsKLSAgICAtd2Via2l0LWZsZXg6IDA7Ci0g ICAgbWluLWhlaWdodDogMjNweDsKLX0KLQotLmRldGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQgLmNv bnRlbnQsCi0uZGV0YWlscy1zZWN0aW9uLnByb2JlLXNldCAuZ3JvdXAsCi0uZGV0YWlscy1zZWN0 aW9uLnByb2JlLXNldCAucm93LAotLmRldGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQgLmRhdGEtZ3Jp ZCB7Ci0gICAgZGlzcGxheTogYmxvY2sgIWltcG9ydGFudDsKLSAgICBwb3NpdGlvbjogYWJzb2x1 dGU7Ci0gICAgdG9wOiAwOwotICAgIGJvdHRvbTogMDsKLSAgICBsZWZ0OiAwOwotICAgIHJpZ2h0 OiAwOwotfQotCi0uZGV0YWlscy1zZWN0aW9uLnByb2JlLXNldCAuZGF0YS1ncmlkIC5kYXRhLWNv bnRhaW5lciB7Ci0gICAgdG9wOiAyM3B4OwotfQotCi0uc2lkZWJhciA+IC5wYW5lbC5wcm9iZS5z ZWxlY3RlZCB7Ci0gICAgZGlzcGxheTogLXdlYmtpdC1mbGV4OwotICAgIC13ZWJraXQtZmxleC1k aXJlY3Rpb246IGNvbHVtbjsKLX0KLQogLnBvcG92ZXIgLnByb2JlLXBvcG92ZXIgewogICAgIHBh ZGRpbmc6IDJweDsKLSAgICBmb250LWZhbWlseTogJ0x1Y2lkYSBHcmFuZGUnLCBIZWx2ZXRpY2Es IHNhbnMtc2VyaWY7Ci0gICAgZm9udC1zaXplOiAxMXB4OwogICAgIG1hcmdpbjogMnB4OwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Q cm9iZVNldERhdGFHcmlkLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1Byb2JlU2V0RGF0YUdyaWQuY3NzCmluZGV4IDQ0OGZiMTY3MGY0ZTAxN2Y4NGIyYzUw MTJkN2M4ODNlZTFkNzI0ZjguLjRmY2UyNmZhZGU3YWYwYmQwNzkwZDZlOTJlMzY3N2RlYTVmYTZm OWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Byb2JlU2V0RGF0YUdyaWQuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1Byb2JlU2V0RGF0YUdyaWQuY3NzCkBAIC0yMywxOCArMjMsMTggQEAKICAq IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCiAgKi8KIAotLmRldGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQgLmRhdGEtZ3Jp ZCAuZGF0YS1jb250YWluZXIgdHIucGFzdC12YWx1ZSB0ZCB7CisuZGV0YWlscy1zZWN0aW9uLnBy b2JlLXNldCAuZGF0YS1ncmlkIHRyLnBhc3QtdmFsdWUgdGQgewogICAgIGJhY2tncm91bmQtY29s b3I6IHJnYmEoMTAwLCAxMDAsIDEwMCwgMC4yKTsKICAgICBmb250LXN0eWxlOiBpdGFsaWM7CiAg ICAgY29sb3I6ICM3Nzc7CiB9CiAKLS5kZXRhaWxzLXNlY3Rpb24ucHJvYmUtc2V0IC5kYXRhLWdy aWQgPiAuZGF0YS1jb250YWluZXIgdGQudW5rbm93bi12YWx1ZSB7CisuZGV0YWlscy1zZWN0aW9u LnByb2JlLXNldCAuZGF0YS1ncmlkID4gdGQudW5rbm93bi12YWx1ZSB7CiAgICAgYmFja2dyb3Vu ZC1jb2xvcjogcmdiYSgyMzAsIDIzMCwgMjMwLCAwLjgpOwogICAgIGJhY2tncm91bmQtaW1hZ2U6 IHJlcGVhdGluZy1saW5lYXItZ3JhZGllbnQoLTQ1ZGVnLCB0cmFuc3BhcmVudCwgdHJhbnNwYXJl bnQgN3B4LCByZ2JhKDI1NSwgMjU1LCAyNTUsIC41KSA3cHgsIHJnYmEoMjU1LCAyNTUsIDI1NSwg LjUpIDE0cHgpOwogfQogCi0uZGV0YWlscy1zZWN0aW9uLnByb2JlLXNldCAuZGF0YS1ncmlkIC5k YXRhLWNvbnRhaW5lciB0ci5yZXZlYWxlZC5oaWdobGlnaHRlZCB7CisuZGV0YWlscy1zZWN0aW9u LnByb2JlLXNldCAuZGF0YS1ncmlkIHRyLnJldmVhbGVkLmhpZ2hsaWdodGVkIHsKICAgICAtd2Vi a2l0LWFuaW1hdGlvbi1kdXJhdGlvbjogMnM7CiAgICAgYW5pbWF0aW9uLXRpbWluZy1mdW5jdGlv bjogZWFzZTsKICAgICAtd2Via2l0LWFuaW1hdGlvbi1pdGVyYXRpb24tY291bnQ6IGluZmluaXRl OwpAQCAtNTEsMTUgKzUxLDE1IEBACiAgICAgfQogfQogCi0uZGV0YWlscy1zZWN0aW9uLnByb2Jl LXNldCAuZGF0YS1ncmlkIC5kYXRhLWNvbnRhaW5lciB0ci5zZXBhcmF0b3IgeworLmRldGFpbHMt c2VjdGlvbi5wcm9iZS1zZXQgLmRhdGEtZ3JpZCB0ci5zZXBhcmF0b3IgewogICAgIGJvcmRlci1i b3R0b206IDNweCBzb2xpZCAjNTU1OwogfQogCi0uZGV0YWlscy1zZWN0aW9uLnByb2JlLXNldCAu ZGF0YS1ncmlkIC5kYXRhLWNvbnRhaW5lciB0ci5zZXBhcmF0b3IgeworLmRldGFpbHMtc2VjdGlv bi5wcm9iZS1zZXQgLmRhdGEtZ3JpZCB0ci5zZXBhcmF0b3IgewogICAgIGJvcmRlci1ib3R0b206 IDJweCBzb2xpZCAjNjY2OwogfQogCi0uZGV0YWlscy1zZWN0aW9uLnByb2JlLXNldCAuZGF0YS1n cmlkID4gLmRhdGEtY29udGFpbmVyIHRyLmRhdGEtdXBkYXRlZCB7CisuZGV0YWlscy1zZWN0aW9u LnByb2JlLXNldCAuZGF0YS1ncmlkID4gdHIuZGF0YS11cGRhdGVkIHsKICAgICAtd2Via2l0LWFu aW1hdGlvbi1kdXJhdGlvbjogMC4zczsKICAgICAtd2Via2l0LWFuaW1hdGlvbi1uYW1lOiBibGlu ay1wcm9iZS1mcmFtZTsKIH0KQEAgLTc0LDQyICs3NCwxNCBAQAogICAgIH0KIH0KIAotLmRldGFp bHMtc2VjdGlvbi5wcm9iZS1zZXQgLmRhdGEtZ3JpZCAuZGF0YS1jb250YWluZXIgLnNlbGVjdGVk IC5zZWN0aW9uICogeworLmRldGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQgLmRhdGEtZ3JpZCAuc2Vs ZWN0ZWQgLnNlY3Rpb24gKiB7CiAgICAgY29sb3I6IHdoaXRlOwogfQogCi0uZGV0YWlscy1zZWN0 aW9uLnByb2JlLXNldCAuZGF0YS1ncmlkIC5kYXRhLWNvbnRhaW5lciAuc2VsZWN0ZWQgdGQudW5r bm93bi12YWx1ZSB7CisuZGV0YWlscy1zZWN0aW9uLnByb2JlLXNldCAuZGF0YS1ncmlkIC5zZWxl Y3RlZCB0ZC51bmtub3duLXZhbHVlIHsKICAgICBjb2xvcjogYmxhY2sgIWltcG9ydGFudDsKIH0K IAotLmRldGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQgLmRhdGEtZ3JpZCAuZGF0YS1jb250YWluZXIg LnNlY3Rpb24geworLmRldGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQgLmRhdGEtZ3JpZCAuc2VjdGlv biB7CiAgICAgbGVmdDogLTZweDsKIH0KLQotLmRldGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQgLmRh dGEtZ3JpZCB0aCB7Ci0gICAgaGVpZ2h0OiAyMXB4OwotCi0gICAgYmFja2dyb3VuZC1pbWFnZTog bGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiKDI0OCwgMjQ4LCAyNDgpLCByZ2IoMjI2LCAy MjYsIDIyNikpOwotICAgIGJhY2tncm91bmQtc2l6ZTogMTAwJSAxMDAlICFpbXBvcnRhbnQ7Ci0g ICAgYmFja2dyb3VuZC1wb3NpdGlvbjogY2VudGVyICFpbXBvcnRhbnQ7Ci0gICAgYmFja2dyb3Vu ZC1yZXBlYXQ6IG5vLXJlcGVhdCAhaW1wb3J0YW50OwotCi0gICAgYm94LXNoYWRvdzogaW5zZXQg cmdiYSgyNTUsIDI1NSwgMjU1LCAwLjEpIDAgMXB4IDA7Ci0gICAgYm9yZGVyLWJvdHRvbTogMXB4 IHNvbGlkIHJnYigxNzksIDE3OSwgMTc5KSAhaW1wb3J0YW50OwotfQotCi0uZGV0YWlscy1zZWN0 aW9uLnByb2JlLXNldCAuZGF0YS1ncmlkIHRoOm5vdCg6bGFzdC1jaGlsZCkgewotICAgIGJvcmRl ci1yaWdodDogMXB4IHNvbGlkIHJnYigxNzksIDE3OSwgMTc5KTsKLX0KLQotLmRldGFpbHMtc2Vj dGlvbi5wcm9iZS1zZXQgLmRhdGEtZ3JpZCB0aCwKLS5kZXRhaWxzLXNlY3Rpb24ucHJvYmUtc2V0 IC5kYXRhLWdyaWQgdGQgewotICAgIHBhZGRpbmctbGVmdDogNnB4OwotICAgIHBhZGRpbmctcmln aHQ6IDZweDsKLX0KLQotLmRldGFpbHMtc2VjdGlvbi5wcm9iZS1zZXQgLmRhdGEtZ3JpZCB0ZCB7 Ci0gICAgcGFkZGluZy10b3A6IDJweDsKLSAgICBwYWRkaW5nLWJvdHRvbTogMnB4OwotICAgIGxp bmUtaGVpZ2h0OiAxN3B4OwotfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5jc3MKaW5kZXggNzhiMmJhNjI2MTQx MzdhZGYzZTcwZTY5YjQ3OTViZTdkNGZjMjRkMy4uZTE4ODUxYjM3ZWFmZDJlNGJjYTE3ZWE2MjA1 NGIyYmQ4ZjI5ODMzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuY3NzCkBAIC0zNyw3ICszNyw2IEBACiAg ICAgb3ZlcmZsb3c6IGhpZGRlbjsKIAogICAgIGZvbnQtZmFtaWx5OiBNZW5sbywgbW9ub3NwYWNl OwotICAgIGZvbnQtc2l6ZTogMTFweDsKIH0KIAogYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5x dWljay1jb25zb2xlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVEYXRhR3JpZC5jc3MKaW5kZXggM2VjYjZlMDMw N2Y4ZDc2YmEwOWJkYmU1ZTk5ZjVjMDU2ZTBhYzdiNi4uNzJiNDJjNzVhN2UxYjQwZjU2MGVhODIy OTU1ZjZkNjllZWJiMDg4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVEYXRhR3JpZC5jc3MKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVEYXRhR3JpZC5jc3MKQEAgLTIzLDEx OCArMjMsOCBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLS5k YXRhLWdyaWQudGltZWxpbmUgewotICAgIGJvcmRlcjogbm9uZTsKLX0KLQotLmRhdGEtZ3JpZC50 aW1lbGluZSB0YWJsZSB7Ci0gICAgZm9udC1zaXplOiAxMXB4OwotfQotCiAuZGF0YS1ncmlkLnRp bWVsaW5lIHRoIHsKLSAgICBoZWlnaHQ6IDIycHg7Ci0KLSAgICBiYWNrZ3JvdW5kLWltYWdlOiBu b25lICFpbXBvcnRhbnQ7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogd2hpdGUgIWltcG9ydGFudDsK LQotICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2IoMTc5LCAxNzksIDE3OSkgIWltcG9ydGFu dDsKLSAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDE3OSwgMTc5LCAxNzkpICFpbXBv cnRhbnQ7Ci19Ci0KLS5kYXRhLWdyaWQudGltZWxpbmUgdGg6bm90KDpsYXN0LWNoaWxkKSB7Ci0g ICAgYm9yZGVyLXJpZ2h0OiAxcHggc29saWQgcmdiKDE3OSwgMTc5LCAxNzkpOwotfQotCi0uZGF0 YS1ncmlkLnRpbWVsaW5lIHRoLnNvcnRhYmxlOmFjdGl2ZSB7Ci0gICAgYmFja2dyb3VuZC1pbWFn ZTogbm9uZSAhaW1wb3J0YW50OwotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigxNzksIDE3OSwg MTc5KSAhaW1wb3J0YW50OwotfQotCi0uZGF0YS1ncmlkLnRpbWVsaW5lIHRoLnNvcnQtYXNjZW5k aW5nLAotLmRhdGEtZ3JpZC50aW1lbGluZSB0aC5zb3J0LWRlc2NlbmRpbmcgewotICAgIGJhY2tn cm91bmQtaW1hZ2U6IG5vbmUgIWltcG9ydGFudDsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2Io MjMwLCAyMzAsIDIzMCkgIWltcG9ydGFudDsKLX0KLQotLmRhdGEtZ3JpZC50aW1lbGluZSAuZGF0 YS1jb250YWluZXIgewotICAgIHRvcDogMjNweDsKLX0KLQotLmRhdGEtZ3JpZC50aW1lbGluZSB0 aCwKLS5kYXRhLWdyaWQudGltZWxpbmUgdGQgewotICAgIHBhZGRpbmctbGVmdDogNnB4OwotICAg IHBhZGRpbmctcmlnaHQ6IDZweDsKLX0KLQotLmRhdGEtZ3JpZC50aW1lbGluZSB0ZDpsYXN0LWNo aWxkIHsKLSAgICBwYWRkaW5nLXJpZ2h0OiAxMnB4OwotfQotCi0uZGF0YS1ncmlkLnRpbWVsaW5l IHRkIHsKLSAgICBwYWRkaW5nLXRvcDogMnB4OwotICAgIHBhZGRpbmctYm90dG9tOiAycHg7Ci0g ICAgbGluZS1oZWlnaHQ6IDE3cHg7Ci19Ci0KLS5kYXRhLWdyaWQudGltZWxpbmUgdGQ6bm90KDps YXN0LWNoaWxkKSB7Ci0gICAgYm9yZGVyLXJpZ2h0OiAxcHggc29saWQgcmdiKDE3OSwgMTc5LCAx NzkpOwotfQotCi0uZGF0YS1ncmlkLnRpbWVsaW5lOmZvY3VzIHRyLnNlbGVjdGVkIHRkOm5vdCg6 bGFzdC1jaGlsZCkgewotICAgIGJvcmRlci1yaWdodC1jb2xvcjogcmdiKDUzLCAxMDksIDE4OSk7 Ci19Ci0KLS5kYXRhLWdyaWQudGltZWxpbmUgdGguc29ydC1hc2NlbmRpbmcgPiBkaXY6Zmlyc3Qt Y2hpbGQsCi0uZGF0YS1ncmlkLnRpbWVsaW5lIHRoLnNvcnQtZGVzY2VuZGluZyA+IGRpdjpmaXJz dC1jaGlsZCB7Ci0gICAgcGFkZGluZy1yaWdodDogMTNweDsKLX0KLQotLmRhdGEtZ3JpZC50aW1l bGluZSB0aC5zb3J0LWFzY2VuZGluZyA+IGRpdjpmaXJzdC1jaGlsZDo6YWZ0ZXIsCi0uZGF0YS1n cmlkLnRpbWVsaW5lIHRoLnNvcnQtZGVzY2VuZGluZyA+IGRpdjpmaXJzdC1jaGlsZDo6YWZ0ZXIg ewotICAgIHRvcDogMXB4OwotfQotCi0uZGF0YS1ncmlkLnRpbWVsaW5lIHRkLmVycm9yIHsKLSAg ICBjb2xvcjogcmdiKDIyNCwgMTYsIDE2KTsKLX0KLQotLmRhdGEtZ3JpZC50aW1lbGluZSB0ci5z ZWxlY3RlZCB0ZC5lcnJvciB7Ci0gICAgY29sb3I6IGluaGVyaXQ7Ci19Ci0KLS5kYXRhLWdyaWQu dGltZWxpbmUgdGQgLmljb24gewotICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKLSAgICB2ZXJ0 aWNhbC1hbGlnbjogdG9wOwotCi0gICAgd2lkdGg6IDE2cHg7Ci0gICAgaGVpZ2h0OiAxNnB4Owot Ci0gICAgbWFyZ2luLXJpZ2h0OiAycHg7Ci19Ci0KLS5kYXRhLWdyaWQudGltZWxpbmUgdGQgLmdv LXRvLWFycm93IHsKLSAgICBmbG9hdDogcmlnaHQ7Ci0KLSAgICB2aXNpYmlsaXR5OiBoaWRkZW47 Ci0KLSAgICBtYXJnaW4tbGVmdDogMnB4OwotfQotCi0uZGF0YS1ncmlkLnRpbWVsaW5lIHRyLnNl bGVjdGVkIC5nby10by1hcnJvdywKLS5kYXRhLWdyaWQudGltZWxpbmUgdHI6aG92ZXIgLmdvLXRv LWFycm93IHsKLSAgICB2aXNpYmlsaXR5OiB2aXNpYmxlOwotfQotCi0uZGF0YS1ncmlkLnRpbWVs aW5lIHRkIC5zdWJ0aXRsZSB7Ci0gICAgY29sb3I6IHJnYmEoMCwgMCwgMCwgMC43KTsKLX0KLQot LmRhdGEtZ3JpZC50aW1lbGluZSB0ZCAuc3VidGl0bGU6OmJlZm9yZSB7Ci0gICAgY29udGVudDog IiDigJQgIjsKLX0KLQotLmRhdGEtZ3JpZC50aW1lbGluZTpmb2N1cyB0ci5zZWxlY3RlZCB0ZCAu c3VidGl0bGUgewotICAgIGNvbG9yOiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAuOSk7CisgICAgYm9y ZGVyLXRvcDogMXB4IHNvbGlkIHJnYigxNzksIDE3OSwgMTc5KTsKIH0KIAogLmRhdGEtZ3JpZC50 aW1lbGluZSA+IC5uYXZpZ2F0aW9uLWJhci1jb250YWluZXIgewpAQCAtMTY1LDcgKzU1LDcgQEAK ICAgICBoZWlnaHQ6IDI4cHg7CiAKICAgICBib3JkZXItYm90dG9tOiBub25lOwotICAgIGJvcmRl ci10b3A6IDFweCBzb2xpZCByZ2IoMjAwLCAyMDAsIDIwMCk7CisgICAgYm9yZGVyLXRvcDogMXB4 IHNvbGlkIHJnYigxNzksIDE3OSwgMTc5KTsKICAgICBib3gtc2hhZG93OiBub25lOwogCiAgICAg YmFja2dyb3VuZC1jb2xvcjogd2hpdGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJ1bGVyLmNzcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUnVsZXIuY3NzCmluZGV4IDgzMDg0 M2FiZmU5MjQ5MTVlY2Y5Y2ZmYWYzOWI1ZWNiMTUxNzI3Y2UuLmFiZjIyZGU2OGJhZDUxYzdjNWQ2 NDU3NGVjZDY2ZDgzMWM3MGU1MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUnVsZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUnVsZXIuY3NzCkBAIC0zNyw3ICsz Nyw3IEBACiB9CiAKIC50aW1lbGluZS1ydWxlciA+IC5oZWFkZXIgewotICAgIGJvcmRlci1ib3R0 b206IDFweCBzb2xpZCByZ2IoMjAwLCAyMDAsIDIwMCk7CisgICAgYm9yZGVyLWJvdHRvbTogMXB4 IHNvbGlkIHJnYigxNzksIDE3OSwgMTc5KTsKIAogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAg ICB0b3A6IDA7CkBAIC01Miw3ICs1Miw3IEBACiAgICAgdG9wOiAwOwogICAgIGJvdHRvbTogMDsK ICAgICAtd2Via2l0LXRyYW5zZm9ybTogdHJhbnNsYXRlWCgtMXB4KTsKLSAgICBiYWNrZ3JvdW5k LWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2JhKDIwMCwgMjAwLCAyMDAsIDAp LCByZ2JhKDIwMCwgMjAwLCAyMDAsIDEpIDg1JSk7CisgICAgYmFja2dyb3VuZC1pbWFnZTogbGlu ZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiYSgxNzksIDE3OSwgMTc5LCAwKSwgcmdiYSgxNzks IDE3OSwgMTc5LCAxKSA4NSUpOwogfQogCiAudGltZWxpbmUtcnVsZXIgPiAuaGVhZGVyID4gLmRp dmlkZXIgPiAubGFiZWwgewo=