Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jQDyM-0001Oa-Ew for pgadmin-hackers@arkaria.postgresql.org; Sun, 19 Apr 2020 17:43:14 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1jQDyL-0007lS-Af for pgadmin-hackers@arkaria.postgresql.org; Sun, 19 Apr 2020 17:43:13 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jQ8wV-0008H8-DN for pgadmin-hackers@lists.postgresql.org; Sun, 19 Apr 2020 12:20:59 +0000 Received: from mail-ua1-x931.google.com ([2607:f8b0:4864:20::931]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1jQ8wO-0005h8-6t for pgadmin-hackers@postgresql.org; Sun, 19 Apr 2020 12:20:58 +0000 Received: by mail-ua1-x931.google.com with SMTP id v24so2511051uak.0 for ; Sun, 19 Apr 2020 05:20:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=/LitLtTpFE7XZHSOBVhm5VozT9CWCofdMjNO3i+G4FI=; b=S6SC/97Ua8E9TMVDGCTmv75OP+LNGVFGthB8/HuLlaifjcuqQga+fn6tF7bzIUV4dT 4H02mWVBjdPQslGLtbJiJ8iTe3X5Ob0vesuMQHK7K+hFmy8dfePRUErHNv7a2HXsPJUh tgUX0Y/37atLrh5DWD063uJrokoBMsj8P8lHIsfDu+S+9BHQOI9hvIErsC9z1KRBddJC cWLWp3MoZHTGAdAdzWegXmuebUjdpcBpvxoX+3ltk6DlpVUvXcSwA6xqgyBIFQd1huTC WX2g7xf2NxgfcTiDd7rbYTIpZajF3OQaFRFHVonhwnP9Vj0TeGP9yXRMu8J82EVxOdaw aTOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/LitLtTpFE7XZHSOBVhm5VozT9CWCofdMjNO3i+G4FI=; b=q93kJYjSoiUGgdmePdksFaqZ9Waq+KnyPEWOAbXzZynqZEZqHSChvlH9bdSBy57B+T E5f+7IX67wz3o6uB1t/1y3cWUAyTRB+tHOoqq7gwYAj3Tend6Kg3uvBszd0C1mtckQ6D f2hx/quXiSLDVuGCFBE+EgbTjruZF/POyrKFHSMge2OrfjeY4vgY3m/xKZLAnq9epEl3 xLxdyNsZTpigrtMmyUg7DRqIcJHE0q2uH/ZqjI9NdcHr/dheHD+6OnMXOKI4J72r+d3d TGDpSGRW7jt48Fe7vRKUYjLtla8+UoISd3rEE7Pc5IYswpmUaYIe2GRCs45i5TBQPeHv ZEYQ== X-Gm-Message-State: AGi0PuabwVNpSAUJlFRaibC+gPl7+BDVO3PHtPPGi2tIopYWQtD5xLUW TkzsOuKWYasAFzfQs06KWWRLksgOIYMJXL4Kn08= X-Google-Smtp-Source: APiQypK4znaKiQfzbVCGREB3/Gm2DT8405+RjPvhKmzgi4qPnH6Kfh9GRZ2e2A0NXEeAjdbKsckw3wL8N40GYYLwQpU= X-Received: by 2002:ab0:443:: with SMTP id 61mr4494544uav.108.1587298850721; Sun, 19 Apr 2020 05:20:50 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: "Libor M." Date: Sun, 19 Apr 2020 14:20:39 +0200 Message-ID: Subject: Re: pgAdmin 4 - next gettext usage fixes To: Akshay Joshi Cc: Aditya Toshniwal , pgadmin-hackers Content-Type: multipart/mixed; boundary="00000000000026e7c505a3a3d099" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --00000000000026e7c505a3a3d099 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi, I sending patch for slightly modified the use of gettext: - fixed `%` vs. `.format()` - unified texts and usage `%s` vs. `{}`/`{0}` - improved text sentences for translate - added gettext for next texts Best regards, Libor M. E-mail: liborm85@gmail.com GitHub: https://github.com/liborm85 =C4=8Dt 16. 4. 2020 v 9:51 odes=C3=ADlatel Akshay Joshi napsal: > > Thanks, patch applied. > > On Wed, Apr 15, 2020 at 5:17 PM Libor M. wrote: >> >> Hi, >> next minor gettext and format fixes in patch. >> >> Best regards, >> >> Libor M. >> >> E-mail: liborm85@gmail.com >> GitHub: https://github.com/liborm85 >> >> st 15. 4. 2020 v 13:17 odes=C3=ADlatel Akshay Joshi >> napsal: >> > >> > Thanks, patch applied. >> > >> > On Wed, Apr 15, 2020 at 2:55 PM Aditya Toshniwal wrote: >> >> >> >> Hi, >> >> >> >> Please find the updated patch. >> >> >> >> On Wed, Apr 15, 2020 at 1:33 PM Akshay Joshi wrote: >> >>> >> >>> Hi Aditya >> >>> >> >>> I think the fix is incorrect. .format method should be applied after= gettext() like gettext().format(). Please check for other places too and s= end the updated patch. >> >>> >> >>> On Wed, Apr 15, 2020 at 11:38 AM Aditya Toshniwal wrote: >> >>>> >> >>>> Hi Hackers/Libor, >> >>>> >> >>>> The changes like below are incorrect. Try "Count rows" from a table= 's context menu. >> >>>> >> >>>> - info=3Dgettext("Table rows counted: %s" % count), >> >>>> >> >>>> + info=3Dgettext("Table rows counted: %s") % count, >> >>>> >> >>>> >> >>>> Attached is the patch to fix all such changes in pgAdmin, to use fo= rmat() instead. >> >>>> Please review. >> >>>> >> >>>> On Fri, Apr 10, 2020 at 2:57 PM Akshay Joshi wrote: >> >>>>> >> >>>>> Hi Libor >> >>>>> >> >>>>> Thanks, patch applied. Please make sure to run the PEP8 checks bef= ore sending the patch. >> >>>>> I have fixed and committed the code. >> >>>>> >> >>>>> On Wed, Apr 8, 2020 at 9:30 PM Libor M. wrote= : >> >>>>>> >> >>>>>> Hello, >> >>>>>> I fixed next gettext usage: >> >>>>>> >> >>>>>> - fixed gettext usage with .format() only for original text with = %s >> >>>>>> - fixed typos >> >>>>>> - fixed translation yes/no buttons in dialog >> >>>>>> - improved translating sentences without "connecting" words (eg. = see >> >>>>>> web/pgadmin/dashboard/static/js/dashboard.js, word 'cancel' needs= to >> >>>>>> be translated in Czech language as 'zru=C5=A1it' but in another s= entence as >> >>>>>> 'zru=C5=A1en=C3=AD') >> >>>>>> - added gettext for text translations >> >>>>>> >> >>>>>> Diff file is attached. >> >>>>>> >> >>>>>> Best regards, >> >>>>>> >> >>>>>> Libor M. >> >>>>>> >> >>>>>> E-mail: liborm85@gmail.com >> >>>>>> GitHub: https://github.com/liborm85 >> >>>>> >> >>>>> >> >>>>> >> >>>>> -- >> >>>>> Thanks & Regards >> >>>>> Akshay Joshi >> >>>>> Sr. Software Architect >> >>>>> EnterpriseDB Software India Private Limited >> >>>>> Mobile: +91 976-788-8246 >> >>>> >> >>>> >> >>>> >> >>>> -- >> >>>> Thanks and Regards, >> >>>> Aditya Toshniwal >> >>>> pgAdmin Hacker | Sr. Software Engineer | EnterpriseDB India | Pune >> >>>> "Don't Complain about Heat, Plant a TREE" >> >>> >> >>> >> >>> >> >>> -- >> >>> Thanks & Regards >> >>> Akshay Joshi >> >>> Sr. Software Architect >> >>> EnterpriseDB Software India Private Limited >> >>> Mobile: +91 976-788-8246 >> >> >> >> >> >> >> >> -- >> >> Thanks and Regards, >> >> Aditya Toshniwal >> >> pgAdmin Hacker | Sr. Software Engineer | EnterpriseDB India | Pune >> >> "Don't Complain about Heat, Plant a TREE" >> > >> > >> > >> > -- >> > Thanks & Regards >> > Akshay Joshi >> > Sr. Software Architect >> > EnterpriseDB Software India Private Limited >> > Mobile: +91 976-788-8246 > > > > -- > Thanks & Regards > Akshay Joshi > Sr. Software Architect > EnterpriseDB Software India Private Limited > Mobile: +91 976-788-8246 --00000000000026e7c505a3a3d099 Content-Type: application/octet-stream; name="pgadmin4_gettext_fix.diff" Content-Disposition: attachment; filename="pgadmin4_gettext_fix.diff" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k970dilv0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vX19pbml0 X18ucHkKaW5kZXggYTFiMTlmYjdlLi5hZTRhMGQzZjQgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWlu L19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL19faW5pdF9fLnB5CkBAIC01MDIsOCArNTAy LDggQEAgZGVmIGNyZWF0ZV9hcHAoYXBwX25hbWU9Tm9uZSk6CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgc3ZyX3BvcnQgPSB3aW5yZWcuUXVlcnlWYWx1ZUV4KGluc3Rfa2V5LCAnUG9ydCcp WzBdCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3ZyX2Rpc2NvdmVyeV9pZCA9IGluc3Rf aWQKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdnJfY29tbWVudCA9IGdldHRleHQoCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJBdXRvLWRldGVjdGVkICVzIGluc3RhbGxh dGlvbiB3aXRoIHRoZSBkYXRhICIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImRp cmVjdG9yeSBhdCB7fSIpLmZvcm1hdCgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IkF1dG8tZGV0ZWN0ZWQgezB9IGluc3RhbGxhdGlvbiB3aXRoIHRoZSBkYXRhICIKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgImRpcmVjdG9yeSBhdCB7MX0iKS5mb3JtYXQoCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3aW5yZWcuUXVlcnlWYWx1ZUV4KAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluc3Rfa2V5LCAnRGlzcGxheSBO YW1lJwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKVswXSwKZGlmZiAtLWdp dCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9l dmVudF90cmlnZ2Vycy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9ldmVudF90cmlnZ2Vycy9fX2luaXRfXy5weQppbmRleCA4 M2JlYzMwY2EuLjIyZmU2ODk2MyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2V2ZW50X3RyaWdnZXJzL19faW5pdF9fLnB5Cisr KyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9l dmVudF90cmlnZ2Vycy9fX2luaXRfXy5weQpAQCAtMzc4LDcgKzM3OCw3IEBAIGNsYXNzIEV2ZW50 VHJpZ2dlclZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgICAgICBzdGF0dXM9NDAw LAogICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICBlcnJvcm1zZz1n ZXR0ZXh0KAotICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVk IHBhcmFtZXRlciB7fS4iKS5mb3JtYXQoZXJyKQorICAgICAgICAgICAgICAgICAgICAiQ291bGQg bm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoe30pLiIpLmZvcm1hdChlcnIpCiAgICAg ICAgICAgICApCiAgICAgICAgIHRyeToKICAgICAgICAgICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0 ZSgKQEAgLTYzNiw3ICs2MzYsNyBAQCBjbGFzcyBFdmVudFRyaWdnZXJWaWV3KFBHQ2hpbGROb2Rl Vmlldyk6CiAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MTAsCiAgICAgICAgICAgICAgICAg ICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0dGV4dCgKLSAg ICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1l dGVyIHt9LiIKKyAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVx dWlyZWQgcGFyYW1ldGVyICh7fSkuIgogICAgICAgICAgICAgICAgICAgICApLmZvcm1hdChhcmcp CiAgICAgICAgICAgICAgICAgKQogICAgICAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKApk aWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL3NjaGVtYXMvZG9tYWlucy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2RvbWFpbnMvX19pbml0X18u cHkKaW5kZXggOGY2ZmVmZTJjLi5hNWIyZmZiZmUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jy b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2RvbWFpbnMvX19p bml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvZG9tYWlucy9fX2luaXRfXy5weQpAQCAtMjE2LDkgKzIxNiw4IEBA IGNsYXNzIERvbWFpblZpZXcoUEdDaGlsZE5vZGVWaWV3LCBEYXRhVHlwZVJlYWRlciwgU2NoZW1h RGlmZk9iamVjdENvbXBhcmUpOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00 MTAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIiAl Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFyZwotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBm aW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKHt9KS4iCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKS5mb3JtYXQoYXJnKQogICAgICAgICAgICAgICAgICAgICAgICAgKQogCiAgICAgICAg ICAgICB0cnk6CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9kb21haW5zL2RvbWFpbl9jb25zdHJhaW50cy9fX2lu aXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFi YXNlcy9zY2hlbWFzL2RvbWFpbnMvZG9tYWluX2NvbnN0cmFpbnRzL19faW5pdF9fLnB5CmluZGV4 IDM4YzY4NmEzYi4uYjU5OTQyNWU5IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3Nl cnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9kb21haW5zL2RvbWFpbl9jb25z dHJhaW50cy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91 cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9kb21haW5zL2RvbWFpbl9jb25zdHJhaW50cy9f X2luaXRfXy5weQpAQCAtMjExLDkgKzIxMSw4IEBAIGNsYXNzIERvbWFpbkNvbnN0cmFpbnRWaWV3 KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQx MCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdWNjZXNzPTAsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0dGV4dCgKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iICUK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXJnCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZp bmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoe30pLiIKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICApLmZvcm1hdChhcmcpCiAgICAgICAgICAgICAgICAgICAgICAgICApCiAKICAgICAgICAg ICAgIHRyeToKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9z ZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2ZvcmVpZ25fdGFibGVzL19faW5pdF9fLnB5IGIvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMv Zm9yZWlnbl90YWJsZXMvX19pbml0X18ucHkKaW5kZXggMjhiMzAxNjRjLi5kODY2OTU2NTMgMTAw NjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFi YXNlcy9zY2hlbWFzL2ZvcmVpZ25fdGFibGVzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2ZvcmVpZ25f dGFibGVzL19faW5pdF9fLnB5CkBAIC0yNjAsOSArMjYwLDggQEAgY2xhc3MgRm9yZWlnblRhYmxl VmlldyhQR0NoaWxkTm9kZVZpZXcsIERhdGFUeXBlUmVhZGVyLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHN0YXR1cz00MTAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3VjY2Vz cz0wLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQg cGFyYW1ldGVyICglcykuIiAlCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFyZwot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKHt9KS4iCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKS5mb3JtYXQoYXJnKQogICAgICAgICAgICAgICAgICAg ICAgICAgKQogCiAgICAgICAgICAgICB0cnk6CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mdHNfY29uZmlndXJh dGlvbnMvc3RhdGljL2pzL2Z0c19jb25maWd1cmF0aW9uLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRzX2NvbmZpZ3VyYXRp b25zL3N0YXRpYy9qcy9mdHNfY29uZmlndXJhdGlvbi5qcwppbmRleCA1NTE2NzczMjIuLjdhNGVk NWVkYyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZl cnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRzX2NvbmZpZ3VyYXRpb25zL3N0YXRpYy9qcy9mdHNfY29u ZmlndXJhdGlvbi5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy dmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mdHNfY29uZmlndXJhdGlvbnMvc3RhdGljL2pzL2Z0c19j b25maWd1cmF0aW9uLmpzCkBAIC0yMTMsNyArMjEzLDcgQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUu ZnRzX2NvbmZpZ3VyYXRpb24nLCBbCiAgICAgICAgICAgJyAgIDwvZGl2PicsCiAgICAgICAgICAg JyAgIDxkaXYgY2xhc3M9ImNvbC02IiBoZWFkZXI9InRva2VuIj48L2Rpdj4nLAogICAgICAgICAg ICcgICA8ZGl2IGNsYXNzPSJjb2wtMiI+JywKLSAgICAgICAgICAnICAgICA8YnV0dG9uIGNsYXNz PSJidG4gYnRuLXNtLXNxIGJ0bi1zZWNvbmRhcnkgYWRkIGZhIGZhLXBsdXMiIDwlPWNhbkFkZCA/ ICIiIDogImRpc2FibGVkPVwnZGlzYWJsZWRcJyIlPiA+PHNwYW4gY2xhc3M9InNyLW9ubHkiPkFk ZCBUb2tlbjwvc3Bhbj48L2J1dHRvbj4nLAorICAgICAgICAgICcgICAgIDxidXR0b24gY2xhc3M9 ImJ0biBidG4tc20tc3EgYnRuLXNlY29uZGFyeSBhZGQgZmEgZmEtcGx1cyIgPCU9Y2FuQWRkID8g IiIgOiAiZGlzYWJsZWQ9XCdkaXNhYmxlZFwnIiU+ID48c3BhbiBjbGFzcz0ic3Itb25seSI+JyAr IGdldHRleHQoJ0FkZCBUb2tlbicpICsgJzwvc3Bhbj48L2J1dHRvbj4nLAogICAgICAgICAgICcg ICA8L2Rpdj4nLAogICAgICAgICAgICcgIDwvZGl2PicsCiAgICAgICAgICAgJyA8L2Rpdj4nLApk aWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL3NjaGVtYXMvZnRzX2RpY3Rpb25hcmllcy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2Z0c19kaWN0 aW9uYXJpZXMvX19pbml0X18ucHkKaW5kZXggNjg1OGVjOGQ2Li44MDViZDBlZmEgMTAwNjQ0Ci0t LSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9z Y2hlbWFzL2Z0c19kaWN0aW9uYXJpZXMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRzX2RpY3Rpb25h cmllcy9fX2luaXRfXy5weQpAQCAtNDMxLDcgKzQzMSw4IEBAIGNsYXNzIEZ0c0RpY3Rpb25hcnlW aWV3KFBHQ2hpbGROb2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBhcmUpOgogICAgICAgICAg ICAgICAgICAgICBzdGF0dXM9NDEwLAogICAgICAgICAgICAgICAgICAgICBzdWNjZXNzPTAsCiAg ICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPV8oCi0gICAgICAgICAgICAgICAgICAgICAgICAi Q291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIgJSBhcmcpCisgICAg ICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRl ciAoe30pLiIKKyAgICAgICAgICAgICAgICAgICAgKS5mb3JtYXQoYXJnKQogICAgICAgICAgICAg ICAgICkKICAgICAgICAgIyBGZXRjaCBzY2hlbWEgbmFtZSBmcm9tIHNjaGVtYSBvaWQKICAgICAg ICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnVuY3Rpb25zL19faW5p dF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJh c2VzL3NjaGVtYXMvZnVuY3Rpb25zL19faW5pdF9fLnB5CmluZGV4IDM1ZDllNDIxNi4uZDM0M2Iz OTRhIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9kYXRhYmFzZXMvc2NoZW1hcy9mdW5jdGlvbnMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnVuY3Rp b25zL19faW5pdF9fLnB5CkBAIC0yNzcsOSArMjc3LDggQEAgY2xhc3MgRnVuY3Rpb25WaWV3KFBH Q2hpbGROb2RlVmlldywgRGF0YVR5cGVSZWFkZXIsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0dXM9NDEwLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlcnJv cm1zZz1nZXR0ZXh0KAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90 IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIgJQotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBhcmcKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICApCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFy YW1ldGVyICh7fSkuIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICkuZm9ybWF0KGFyZykK ICAgICAgICAgICAgICAgICAgICAgICAgICkKIAogICAgICAgICAgICAgbGlzdF9wYXJhbXMgPSBb XQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvcGFja2FnZXMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9wYWNrYWdlcy9fX2lu aXRfXy5weQppbmRleCBmM2QyNGRmMTQuLmUxZWM3Y2FjZiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvcGFja2Fn ZXMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl cnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvcGFja2FnZXMvX19pbml0X18ucHkKQEAgLTU1Nyw4ICs1 NTcsOSBAQCBjbGFzcyBQYWNrYWdlVmlldyhQR0NoaWxkTm9kZVZpZXcsIFNjaGVtYURpZmZPYmpl Y3RDb21wYXJlKToKICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MDAsCiAgICAgICAg ICAgICAgICAgICAgICAgICBzdWNjZXNzPTAsCiAgICAgICAgICAgICAgICAgICAgICAgICBlcnJv cm1zZz1fKAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUg cmVxdWlyZWQgcGFyYW1ldGVyICglcykuIikKLSAgICAgICAgICAgICAgICAgICAgICAgICUgYXJn KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWly ZWQgcGFyYW1ldGVyICh7fSkuIgorICAgICAgICAgICAgICAgICAgICAgICAgKS5mb3JtYXQoYXJn KQorICAgICAgICAgICAgICAgICAgICApCiAKICAgICAgICAgU1FMLCBuYW1lID0gc2VsZi5nZXRT UUwoZ2lkLCBzaWQsIGRpZCwgZGF0YSwgc2NpZCwgcGtnaWQpCiAgICAgICAgICMgTW9zdCBwcm9i YWJseSB0aGlzIGlzIGR1ZSB0byBlcnJvcgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvc2VxdWVuY2VzL19faW5p dF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJh c2VzL3NjaGVtYXMvc2VxdWVuY2VzL19faW5pdF9fLnB5CmluZGV4IDAzZDJkYTFlNi4uYzVmNmM0 ZTliIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9kYXRhYmFzZXMvc2NoZW1hcy9zZXF1ZW5jZXMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvc2VxdWVu Y2VzL19faW5pdF9fLnB5CkBAIC0zODEsOCArMzgxLDggQEAgY2xhc3MgU2VxdWVuY2VWaWV3KFBH Q2hpbGROb2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBhcmUpOgogICAgICAgICAgICAgICAg ICAgICBzdGF0dXM9NDAwLAogICAgICAgICAgICAgICAgICAgICBzdWNjZXNzPTAsCiAgICAgICAg ICAgICAgICAgICAgIGVycm9ybXNnPV8oCi0gICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQg bm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIgJSBhcmcKLSAgICAgICAgICAg ICAgICAgICAgKQorICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSBy ZXF1aXJlZCBwYXJhbWV0ZXIgKHt9KS4iCisgICAgICAgICAgICAgICAgICAgICkuZm9ybWF0KGFy ZykKICAgICAgICAgICAgICAgICApCiAKICAgICAgICAgdHJ5OgpAQCAtNTkwLDggKzU5MCw4IEBA IGNsYXNzIFNlcXVlbmNlVmlldyhQR0NoaWxkTm9kZVZpZXcsIFNjaGVtYURpZmZPYmplY3RDb21w YXJlKToKICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MDAsCiAgICAgICAgICAgICAg ICAgICAgICAgICBzdWNjZXNzPTAsCiAgICAgICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1f KAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWly ZWQgcGFyYW1ldGVyICglcykuIiAlIGFyZwotICAgICAgICAgICAgICAgICAgICAgICAgKQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFy YW1ldGVyICh7fSkuIgorICAgICAgICAgICAgICAgICAgICAgICAgKS5mb3JtYXQoYXJnKQogICAg ICAgICAgICAgICAgICAgICApCiAgICAgICAgIFNRTCwgbmFtZSA9IHNlbGYuZ2V0U1FMKGdpZCwg c2lkLCBkaWQsIGRhdGEsIHNjaWQsIHNlaWQpCiAgICAgICAgICMgTW9zdCBwcm9iYWJseSB0aGlz IGlzIGR1ZSB0byBlcnJvcgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3J1bGVzL19faW5pdF9fLnB5 IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3Nj aGVtYXMvdGFibGVzL3J1bGVzL19faW5pdF9fLnB5CmluZGV4IDI2Yzc5ODgxYi4uZjRmNTAwYjI4 IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9k YXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvcnVsZXMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVz L3J1bGVzL19faW5pdF9fLnB5CkBAIC0zNDEsOCArMzQxLDggQEAgY2xhc3MgUnVsZVZpZXcoUEdD aGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICAgICAg ICAgIHN0YXR1cz00MTAsCiAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAg ICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0dGV4dCgKLSAgICAgICAgICAgICAgICAgICAgICAgICJD b3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIiAlIGFyZwotICAgICAg ICAgICAgICAgICAgICApCisgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQg dGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoe30pLiIKKyAgICAgICAgICAgICAgICAgICAgKS5mb3Jt YXQoYXJnKQogICAgICAgICAgICAgICAgICkKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgU1FM ID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3RyaWdn ZXJzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZl cnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3RyaWdnZXJzL19faW5pdF9fLnB5CmluZGV4IDcz ODNkN2FkMi4uYjE1YWRhZTJlIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvdHJpZ2dlcnMvX19pbml0 X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL3NjaGVtYXMvdGFibGVzL3RyaWdnZXJzL19faW5pdF9fLnB5CkBAIC01NDIsOSArNTQy LDggQEAgY2xhc3MgVHJpZ2dlclZpZXcoUEdDaGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0 Q29tcGFyZSk6CiAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MTAsCiAgICAgICAgICAgICAg ICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0dGV4dCgK LSAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFy YW1ldGVyICglcykuIiAlCi0gICAgICAgICAgICAgICAgICAgICAgICByZXF1aXJlZF9hcmdzW2Fy Z10KLSAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxk IG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKHt9KS4iCisgICAgICAgICAgICAgICAg ICAgICkuZm9ybWF0KHJlcXVpcmVkX2FyZ3NbYXJnXSkKICAgICAgICAgICAgICAgICApCiAKICAg ICAgICAgIyBBZGRpbmcgcGFyZW50IGludG8gZGF0YSBkaWN0LCB3aWxsIGJlIHVzaW5nIGl0IHdo aWxlIGNyZWF0aW5nIHNxbApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvcGdhZ2VudC9zdGVwcy9zdGF0aWMvanMvcGdhX2pvYnN0ZXAuanMgYi93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9wZ2FnZW50L3N0ZXBzL3N0 YXRpYy9qcy9wZ2Ffam9ic3RlcC5qcwppbmRleCA0ZGY4ZTA1MTcuLmMxM2IzMjVmNyAxMDA2NDQK LS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvcGdhZ2VudC9z dGVwcy9zdGF0aWMvanMvcGdhX2pvYnN0ZXAuanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvcGdhZ2VudC9zdGVwcy9zdGF0aWMvanMvcGdhX2pvYnN0ZXAu anMKQEAgLTE5MCw4ICsxOTAsNyBAQCBkZWZpbmUoJ3BnYWRtaW4ubm9kZS5wZ2Ffam9ic3RlcCcs IFsKICAgICAgICAgICBpZDogJ2pzdGNvbm5zdHInLCBsYWJlbDogZ2V0dGV4dCgnQ29ubmVjdGlv biBzdHJpbmcnKSwgdHlwZTogJ3RleHQnLAogICAgICAgICAgIGRlcHM6IFsnanN0a2luZCcsICdq c3Rjb25udHlwZSddLCBkaXNhYmxlZDogZnVuY3Rpb24obSkgewogICAgICAgICAgICAgcmV0dXJu ICFtLmdldCgnanN0a2luZCcpIHx8IG0uZ2V0KCdqc3Rjb25udHlwZScpOwotICAgICAgICAgIH0s IGhlbHBNZXNzYWdlOiBnZXR0ZXh0KCdQbGVhc2Ugc3BlY2lmeSB0aGUgY29ubmVjdGlvbiBzdHJp bmcgZm9yIHRoZSByZW1vdGUgZGF0YWJhc2Ugc2VydmVyLiBFYWNoIHBhcmFtZXRlciBzZXR0aW5n IGlzIGluIHRoZSBmb3JtIGtleXdvcmQgPSB2YWx1ZS4gU3BhY2VzIGFyb3VuZCB0aGUgZXF1YWwg c2lnbiBhcmUgb3B0aW9uYWwuIFRvIHdyaXRlIGFuIGVtcHR5IHZhbHVlLCBvciBhIHZhbHVlIGNv bnRhaW5pbmcgc3BhY2VzLCBzdXJyb3VuZCBpdCB3aXRoIHNpbmdsZSBxdW90ZXMsIGUuZy4sIGtl eXdvcmQgPSBcJ2EgdmFsdWVcJy4gU2luZ2xlIHF1b3RlcyBhbmQgYmFja3NsYXNoZXMgd2l0aGlu IHRoZSB2YWx1ZSBtdXN0IGJlIGVzY2FwZWQgd2l0aCBhIGJhY2tzbGFzaCwgaS5lLiwgXCcgYW5k IFxcLjxicj5Gb3IgbW9yZSBpbmZvcm1hdGlvbiwgcGxlYXNlIHNlZSB0aGUgZG9jdW1lbnRhdGlv biBvbiAlcycsCi0gICAgICAgICAgICAnPGEgaHJlZj0iaHR0cHM6Ly93d3cucG9zdGdyZXNxbC5v cmcvZG9jcy9jdXJyZW50L2xpYnBxLWNvbm5lY3QuaHRtbCNMSUJQUS1DT05OU1RSSU5HIiB0YXJn ZXQ9Il9ibGFuayI+bGlicHEgY29ubmVjdGlvbiBzdHJpbmdzPC9hPicKKyAgICAgICAgICB9LCBo ZWxwTWVzc2FnZTogZ2V0dGV4dCgnUGxlYXNlIHNwZWNpZnkgdGhlIGNvbm5lY3Rpb24gc3RyaW5n IGZvciB0aGUgcmVtb3RlIGRhdGFiYXNlIHNlcnZlci4gRWFjaCBwYXJhbWV0ZXIgc2V0dGluZyBp cyBpbiB0aGUgZm9ybSBrZXl3b3JkID0gdmFsdWUuIFNwYWNlcyBhcm91bmQgdGhlIGVxdWFsIHNp Z24gYXJlIG9wdGlvbmFsLiBUbyB3cml0ZSBhbiBlbXB0eSB2YWx1ZSwgb3IgYSB2YWx1ZSBjb250 YWluaW5nIHNwYWNlcywgc3Vycm91bmQgaXQgd2l0aCBzaW5nbGUgcXVvdGVzLCBlLmcuLCBrZXl3 b3JkID0gXCdhIHZhbHVlXCcuIFNpbmdsZSBxdW90ZXMgYW5kIGJhY2tzbGFzaGVzIHdpdGhpbiB0 aGUgdmFsdWUgbXVzdCBiZSBlc2NhcGVkIHdpdGggYSBiYWNrc2xhc2gsIGkuZS4sIFwnIGFuZCBc XC48YnI+Rm9yIG1vcmUgaW5mb3JtYXRpb24sIHBsZWFzZSBzZWUgdGhlIGRvY3VtZW50YXRpb24g b24gPGEgaHJlZj0iaHR0cHM6Ly93d3cucG9zdGdyZXNxbC5vcmcvZG9jcy9jdXJyZW50L2xpYnBx LWNvbm5lY3QuaHRtbCNMSUJQUS1DT05OU1RSSU5HIiB0YXJnZXQ9Il9ibGFuayI+bGlicHEgY29u bmVjdGlvbiBzdHJpbmdzPC9hPi4nCiAgICAgICAgICAgKSwgbW9kZTogWydjcmVhdGUnLCAnZWRp dCddLAogICAgICAgICB9LHsKICAgICAgICAgICBpZDogJ2pzdG9uZXJyb3InLCBsYWJlbDogZ2V0 dGV4dCgnT24gZXJyb3InKSwgY2VsbDogJ3NlbGVjdDInLApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvdGVtcGxhdGVzL3NlcnZlcnMvcGFzc3dv cmQuaHRtbCBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3RlbXBs YXRlcy9zZXJ2ZXJzL3Bhc3N3b3JkLmh0bWwKaW5kZXggOWZjMGIzOTQ1Li4wY2IxNWYyYzkgMTAw NjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3RlbXBs YXRlcy9zZXJ2ZXJzL3Bhc3N3b3JkLmh0bWwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL3NlcnZlcnMvdGVtcGxhdGVzL3NlcnZlcnMvcGFzc3dvcmQuaHRtbApAQCAtMyw3 ICszLDcgQEAKICAgICAgICAgPGRpdj48c3BhbiBjbGFzcz0iZm9udC13ZWlnaHQtYm9sZCIgPnt7 IF8oJ1BsZWFzZSBlbnRlciB0aGUgcGFzc3dvcmQgZm9yIHRoZSB1c2VyIFwnezB9XCcgdG8gY29u bmVjdCB0aGUgc2VydmVyIC0gInsxfSInKS5mb3JtYXQodXNlcm5hbWUsCiAgICAgICAgICAgICBz ZXJ2ZXJfbGFiZWwpIH19PC9zcGFuPjwvZGl2PgogICAgICAgICA8ZGl2IGNsYXNzPSJpbnB1dC1n cm91cCByb3cgcHktMiI+Ci0gICAgICAgICAgICA8bGFiZWwgZm9yPSJwYXNzd29yZCIgY2xhc3M9 ImNvbC1zbS0yIGNvbC1mb3JtLWxhYmVsIiBhcmlhLWhpZGRlbj0idHJ1ZSI+UGFzc3dvcmQ8L2xh YmVsPgorICAgICAgICAgICAgPGxhYmVsIGZvcj0icGFzc3dvcmQiIGNsYXNzPSJjb2wtc20tMiBj b2wtZm9ybS1sYWJlbCIgYXJpYS1oaWRkZW49InRydWUiPnt7IF8oJ1Bhc3N3b3JkJykgfX08L2xh YmVsPgogICAgICAgICAgICAgPGRpdiBjbGFzcz0iY29sLXNtLTEwIj4KICAgICAgICAgICAgICAg PGlucHV0IGlkPSJwYXNzd29yZCIgY2xhc3M9ImZvcm0tY29udHJvbCIgbmFtZT0icGFzc3dvcmQi IHR5cGU9InBhc3N3b3JkIj4KICAgICAgICAgICAgIDwvZGl2PgpkaWZmIC0tZ2l0IGEvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvdGVtcGxhdGVzL3NlcnZlcnMvdHVu bmVsX3Bhc3N3b3JkLmh0bWwgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy dmVycy90ZW1wbGF0ZXMvc2VydmVycy90dW5uZWxfcGFzc3dvcmQuaHRtbAppbmRleCA4NzI0Yzgw MzUuLmVhMWRjMTc4YyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3Jv dXBzL3NlcnZlcnMvdGVtcGxhdGVzL3NlcnZlcnMvdHVubmVsX3Bhc3N3b3JkLmh0bWwKKysrIGIv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvdGVtcGxhdGVzL3NlcnZl cnMvdHVubmVsX3Bhc3N3b3JkLmh0bWwKQEAgLTE3LDcgKzE3LDcgQEAKICAgICAgICAgICAgICAg ICAgICAgPGlucHV0IGNsYXNzPSJjdXN0b20tY29udHJvbC1pbnB1dCIgaWQ9InNhdmVfdHVubmVs X3Bhc3N3b3JkIiBuYW1lPSJzYXZlX3R1bm5lbF9wYXNzd29yZCIgdHlwZT0iY2hlY2tib3giCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICB7JSBpZiBub3QgY29uZmlnLkFMTE9XX1NBVkVfVFVO TkVMX1BBU1NXT1JEICAlfWRpc2FibGVkeyUgZW5kaWYgJX0KICAgICAgICAgICAgICAgICAgICAg PgotICAgICAgICAgICAgICAgICAgICA8bGFiZWwgY2xhc3M9ImN1c3RvbS1jb250cm9sLWxhYmVs IiBmb3I9InNhdmVfdHVubmVsX3Bhc3N3b3JkIiBjbGFzcz0ibWwtMSI+U2F2ZSBQYXNzd29yZDwv bGFiZWw+CisgICAgICAgICAgICAgICAgICAgIDxsYWJlbCBjbGFzcz0iY3VzdG9tLWNvbnRyb2wt bGFiZWwiIGZvcj0ic2F2ZV90dW5uZWxfcGFzc3dvcmQiIGNsYXNzPSJtbC0xIj57eyBfKCdTYXZl IFBhc3N3b3JkJykgfX08L2xhYmVsPgogICAgICAgICAgICAgICAgIDwvZGl2PgogICAgICAgICAg ICAgPC9kaXY+CiAgICAgICAgIDwvZGl2PgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zdGF0aWMvanMvYnJvd3Nlci5qcyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL2Jy b3dzZXIuanMKaW5kZXggYTJiY2Q3OGM2Li45YTI5ODBhODEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc3RhdGljL2pzL2Jyb3dzZXIuanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zdGF0aWMvanMvYnJvd3Nlci5qcwpAQCAtMjI2LDcgKzIyNiw3IEBAIGRlZmluZSgncGdhZG1p bi5icm93c2VyJywgWwogICAgICAgICB3aWR0aDogNTAwLAogICAgICAgICBpc0Nsb3NlYWJsZTog ZmFsc2UsCiAgICAgICAgIGlzUHJpdmF0ZTogdHJ1ZSwKLSAgICAgICAgY29udGVudDogJzxsYWJl bCBmb3I9InNxbC10ZXh0YXJlYSIgY2xhc3M9InNyLW9ubHkiPlNRTCBDb2RlPC9sYWJlbD48ZGl2 IGNsYXNzPSJzcWxfdGV4dGFyZWEiPjx0ZXh0YXJlYSBpZD0ic3FsLXRleHRhcmVhIiBuYW1lPSJz cWwtdGV4dGFyZWEiIHRpdGxlPSInK2dldHRleHQoJ1NRTCBDb2RlJykrJyI+PC90ZXh0YXJlYT48 L2Rpdj4nLAorICAgICAgICBjb250ZW50OiAnPGxhYmVsIGZvcj0ic3FsLXRleHRhcmVhIiBjbGFz cz0ic3Itb25seSI+JyArIGdldHRleHQoJ1NRTCBDb2RlJykgKyAnPC9sYWJlbD48ZGl2IGNsYXNz PSJzcWxfdGV4dGFyZWEiPjx0ZXh0YXJlYSBpZD0ic3FsLXRleHRhcmVhIiBuYW1lPSJzcWwtdGV4 dGFyZWEiIHRpdGxlPSInICsgZ2V0dGV4dCgnU1FMIENvZGUnKSArICciPjwvdGV4dGFyZWE+PC9k aXY+JywKICAgICAgIH0pLAogICAgICAgLy8gRGVwZW5kZW5jaWVzIG9mIHRoZSBvYmplY3QKICAg ICAgICdkZXBlbmRlbmNpZXMnOiBuZXcgcGdBZG1pbi5Ccm93c2VyLlBhbmVsKHsKZGlmZiAtLWdp dCBhL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3N0YXRpYy9qcy91dGlsaXR5LmpzIGIv d2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvc3RhdGljL2pzL3V0aWxpdHkuanMKaW5kZXgg MDQwNjBiNzdkLi4zNTNiYWY1NjAgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9t YW5hZ2VyL3N0YXRpYy9qcy91dGlsaXR5LmpzCisrKyBiL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9t YW5hZ2VyL3N0YXRpYy9qcy91dGlsaXR5LmpzCkBAIC0xNTUyLDcgKzE1NTIsNyBAQCBkZWZpbmUo WwogICAgICAgICAgICAgJzxkaXYgaWQ9Im11bHRpcGxlLXVwbG9hZHMiIGNsYXNzPSJkcm9wem9u ZSBmbGV4LWdyb3ctMSBkLWZsZXggcC0xIj4nKwogICAgICAgICAgICAgJzxkaXYgY2xhc3M9ImR6 LWRlZmF1bHQgZHotbWVzc2FnZSBkLW5vbmUiPjwvZGl2PicrCiAgICAgICAgICAgICAnPC9kaXY+ JyArCi0gICAgICAgICAgICAnPGRpdiBjbGFzcz0icHJvbXB0LWluZm8iPkRyb3AgZmlsZXMgaGVy ZSB0byB1cGxvYWQuICcgKyBsZy5maWxlX3NpemVfbGltaXQgKworICAgICAgICAgICAgJzxkaXYg Y2xhc3M9InByb21wdC1pbmZvIj4nICsgZ2V0dGV4dCgnRHJvcCBmaWxlcyBoZXJlIHRvIHVwbG9h ZC4nKSArICcgJyArIGxnLmZpbGVfc2l6ZV9saW1pdCArCiAgICAgICAgICAgICBjb25maWcudXBs b2FkLmZpbGVTaXplTGltaXQgKyAnICcgKyBsZy5tYiArICcuPC9kaXY+JywKICAgICAgICAgICAg IHBhdGggPSAkKCcuY3VycmVudHBhdGgnKS52YWwoKSwKICAgICAgICAgICAgIGZpbGVzaXplbGlt aXQgPSBjb25maWcudXBsb2FkLmZpbGVTaXplTGltaXQsCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1p bi9taXNjL3N0YXRpYy9leHBsYWluL2pzL2V4cGxhaW4uanMgYi93ZWIvcGdhZG1pbi9taXNjL3N0 YXRpYy9leHBsYWluL2pzL2V4cGxhaW4uanMKaW5kZXggYzNmNmVkN2RkLi5mMjBhNDI3ZTIgMTAw NjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL21pc2Mvc3RhdGljL2V4cGxhaW4vanMvZXhwbGFpbi5qcwor KysgYi93ZWIvcGdhZG1pbi9taXNjL3N0YXRpYy9leHBsYWluL2pzL2V4cGxhaW4uanMKQEAgLTQ5 MCw0NCArNDkwLDQ0IEBAIGRlZmluZSgncGdhZG1pbi5taXNjLmV4cGxhaW4nLCBbCiAKICAgICBp ZiAoJ0pvaW4gRmlsdGVyJyBpbiBfcGxhbkRhdGEpIHsKICAgICAgIG5vZGVfZXh0cmFfaW5mby5w dXNoKAotICAgICAgICAnPHN0cm9uZz5Kb2luIEZpbHRlcjwvc3Ryb25nPjogJyArIF8uZXNjYXBl KF9wbGFuRGF0YVsnSm9pbiBGaWx0ZXInXSkKKyAgICAgICAgJzxzdHJvbmc+JyArIGdldHRleHQo J0pvaW4gRmlsdGVyJykgKyAnPC9zdHJvbmc+OiAnICsgXy5lc2NhcGUoX3BsYW5EYXRhWydKb2lu IEZpbHRlciddKQogICAgICAgKTsKICAgICB9CiAKICAgICBpZiAoJ0ZpbHRlcicgaW4gX3BsYW5E YXRhKSB7Ci0gICAgICBub2RlX2V4dHJhX2luZm8ucHVzaCgnPHN0cm9uZz5GaWx0ZXI8L3N0cm9u Zz46ICcgKyBfLmVzY2FwZShfcGxhbkRhdGFbJ0ZpbHRlciddKSk7CisgICAgICBub2RlX2V4dHJh X2luZm8ucHVzaCgnPHN0cm9uZz4nICsgZ2V0dGV4dCgnRmlsdGVyJykgKyAnPC9zdHJvbmc+OiAn ICsgXy5lc2NhcGUoX3BsYW5EYXRhWydGaWx0ZXInXSkpOwogICAgIH0KIAogICAgIGlmICgnSW5k ZXggQ29uZCcgaW4gX3BsYW5EYXRhKSB7Ci0gICAgICBub2RlX2V4dHJhX2luZm8ucHVzaCgnPHN0 cm9uZz5JbmRleCBDb25kPC9zdHJvbmc+OiAnICsgXy5lc2NhcGUoX3BsYW5EYXRhWydJbmRleCBD b25kJ10pKTsKKyAgICAgIG5vZGVfZXh0cmFfaW5mby5wdXNoKCc8c3Ryb25nPicgKyBnZXR0ZXh0 KCdJbmRleCBDb25kJykgKyAnPC9zdHJvbmc+OiAnICsgXy5lc2NhcGUoX3BsYW5EYXRhWydJbmRl eCBDb25kJ10pKTsKICAgICB9CiAKICAgICBpZiAoJ0hhc2ggQ29uZCcgaW4gX3BsYW5EYXRhKSB7 Ci0gICAgICBub2RlX2V4dHJhX2luZm8ucHVzaCgnPHN0cm9uZz5IYXNoIENvbmQ8L3N0cm9uZz46 ICcgKyBfLmVzY2FwZShfcGxhbkRhdGFbJ0hhc2ggQ29uZCddKSk7CisgICAgICBub2RlX2V4dHJh X2luZm8ucHVzaCgnPHN0cm9uZz4nICsgZ2V0dGV4dCgnSGFzaCBDb25kJykgKyAnPC9zdHJvbmc+ OiAnICsgXy5lc2NhcGUoX3BsYW5EYXRhWydIYXNoIENvbmQnXSkpOwogICAgIH0KIAogICAgIGlm ICgnUm93cyBSZW1vdmVkIGJ5IEZpbHRlcicgaW4gX3BsYW5EYXRhKSB7CiAgICAgICBub2RlX2V4 dHJhX2luZm8ucHVzaCgKLSAgICAgICAgJzxzdHJvbmc+Um93cyBSZW1vdmVkIGJ5IEZpbHRlcjwv c3Ryb25nPjogJyArCisgICAgICAgICc8c3Ryb25nPicgKyBnZXR0ZXh0KCdSb3dzIFJlbW92ZWQg YnkgRmlsdGVyJykgKyAnPC9zdHJvbmc+OiAnICsKICAgICAgICAgICBfLmVzY2FwZShfcGxhbkRh dGFbJ1Jvd3MgUmVtb3ZlZCBieSBGaWx0ZXInXSkKICAgICAgICk7CiAgICAgfQogCiAgICAgaWYg KCdQZWFrIE1lbW9yeSBVc2FnZScgaW4gX3BsYW5EYXRhKSB7CiAgICAgICB2YXIgYnVmZmVyID0g WwotICAgICAgICAnPHN0cm9uZz5CdWNrZXRzPC9zdHJvbmc+OicsIF8uZXNjYXBlKF9wbGFuRGF0 YVsnSGFzaCBCdWNrZXRzJ10pLAotICAgICAgICAnPHN0cm9uZz5CYXRjaGVzPC9zdHJvbmc+Oics IF8uZXNjYXBlKF9wbGFuRGF0YVsnSGFzaCBCYXRjaGVzJ10pLAotICAgICAgICAnPHN0cm9uZz5N ZW1vcnkgVXNhZ2U8L3N0cm9uZz46JywgXy5lc2NhcGUoX3BsYW5EYXRhWydQZWFrIE1lbW9yeSBV c2FnZSddKSwgJ2tCJywKKyAgICAgICAgJzxzdHJvbmc+JyArIGdldHRleHQoJ0J1Y2tldHMnKSAr ICc8L3N0cm9uZz46JywgXy5lc2NhcGUoX3BsYW5EYXRhWydIYXNoIEJ1Y2tldHMnXSksCisgICAg ICAgICc8c3Ryb25nPicgKyBnZXR0ZXh0KCdCYXRjaGVzJykgKyAnPC9zdHJvbmc+OicsIF8uZXNj YXBlKF9wbGFuRGF0YVsnSGFzaCBCYXRjaGVzJ10pLAorICAgICAgICAnPHN0cm9uZz4nICsgZ2V0 dGV4dCgnTWVtb3J5IFVzYWdlJykgKyAnPC9zdHJvbmc+OicsIF8uZXNjYXBlKF9wbGFuRGF0YVsn UGVhayBNZW1vcnkgVXNhZ2UnXSksICdrQicsCiAgICAgICBdLmpvaW4oJyAnKTsKICAgICAgIG5v ZGVfZXh0cmFfaW5mby5wdXNoKGJ1ZmZlcik7CiAgICAgfQogCiAgICAgaWYgKCdSZWNoZWNrIENv bmQnIGluIF9wbGFuRGF0YSkgewotICAgICAgbm9kZV9leHRyYV9pbmZvLnB1c2goJzxzdHJvbmc+ UmVjaGVjayBDb25kPC9zdHJvbmc+OiAnICsgX3BsYW5EYXRhWydSZWNoZWNrIENvbmQnXSk7Cisg ICAgICBub2RlX2V4dHJhX2luZm8ucHVzaCgnPHN0cm9uZz4nICsgZ2V0dGV4dCgnUmVjaGVjayBD b25kJykgKyAnPC9zdHJvbmc+OiAnICsgX3BsYW5EYXRhWydSZWNoZWNrIENvbmQnXSk7CiAgICAg fQogCiAgICAgaWYgKCdFeGFjdCBIZWFwIEJsb2NrcycgaW4gX3BsYW5EYXRhKSB7Ci0gICAgICBu b2RlX2V4dHJhX2luZm8ucHVzaCgnPHN0cm9uZz5IZWFwIEJsb2Nrczwvc3Ryb25nPjogZXhhY3Q9 JyArIF9wbGFuRGF0YVsnRXhhY3QgSGVhcCBCbG9ja3MnXSk7CisgICAgICBub2RlX2V4dHJhX2lu Zm8ucHVzaCgnPHN0cm9uZz4nICsgZ2V0dGV4dCgnSGVhcCBCbG9ja3MnKSArICc8L3N0cm9uZz46 IGV4YWN0PScgKyBfcGxhbkRhdGFbJ0V4YWN0IEhlYXAgQmxvY2tzJ10pOwogICAgIH0KIAogICAg IGluZm8ucm93cy5wdXNoKF9leHBsYWluUm93VGVtcGxhdGUoewpkaWZmIC0tZ2l0IGEvd2ViL3Bn YWRtaW4vc3RhdGljL2pzL2JhY2tncmlkLnBnYWRtaW4uanMgYi93ZWIvcGdhZG1pbi9zdGF0aWMv anMvYmFja2dyaWQucGdhZG1pbi5qcwppbmRleCBlMTk2ZWZhMGQuLjg0MDA5YTE1MiAxMDA2NDQK LS0tIGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2JhY2tncmlkLnBnYWRtaW4uanMKKysrIGIvd2Vi L3BnYWRtaW4vc3RhdGljL2pzL2JhY2tncmlkLnBnYWRtaW4uanMKQEAgLTEwODEsNyArMTA4MSw3 IEBAIGRlZmluZShbCiAgICAgfSwKICAgICByZW5kZXI6IGZ1bmN0aW9uKCkgewogICAgICAgdGhp cy4kZWwuZW1wdHkoKTsKLSAgICAgIHRoaXMuJGVsLmh0bWwoJzxsYWJlbD48YT48c3BhbiBzdHls ZT1cJ2ZvbnQtd2VpZ2h0Om5vcm1hbDtcJz5BcnJheSBWYWx1ZXM8L2E+PC9zcGFuPjwvbGFiZWw+ IDxidXR0b24gY2xhc3M9XCdidG4tc20gYnRuLXNlY29uZGFyeSBhZGRcJz5BZGQ8L2J1dHRvbj4n KTsKKyAgICAgIHRoaXMuJGVsLmh0bWwoJzxsYWJlbD48YT48c3BhbiBzdHlsZT1cJ2ZvbnQtd2Vp Z2h0Om5vcm1hbDtcJz4nICsgZ2V0dGV4dCgnQXJyYXkgVmFsdWVzJykgKyAnPC9hPjwvc3Bhbj48 L2xhYmVsPiA8YnV0dG9uIGNsYXNzPVwnYnRuLXNtIGJ0bi1zZWNvbmRhcnkgYWRkXCc+JyArIGdl dHRleHQoJ0FkZCcpICsgJzwvYnV0dG9uPicpOwogICAgICAgdGhpcy5kZWxlZ2F0ZUV2ZW50cygp OwogICAgICAgcmV0dXJuIHRoaXM7CiAgICAgfSwKQEAgLTIwNTUsNyArMjA1NSw3IEBAIGRlZmlu ZShbCiAgICAgICAgICQoYDxkaXYgY2xhc3M9ImN1c3RvbS1jb250cm9sIGN1c3RvbS1jaGVja2Jv eCBjdXN0b20tY2hlY2tib3gtbm8tbGFiZWwgJHthbGlnbl9jZW50ZXI/J3RleHQtY2VudGVyJzon J30iPgogICAgICAgICAgIDxpbnB1dCB0YWJpbmRleD0iMCIgdHlwZT0iY2hlY2tib3giIGNsYXNz PSJjdXN0b20tY29udHJvbC1pbnB1dCIgaWQ9IiR7aWR9IiAkeyFlZGl0YWJsZT8nZGlzYWJsZWQn OicnfSAke2NoZWNrZWQ/J2NoZWNrZWQnOicnfS8+CiAgICAgICAgICAgPGxhYmVsIGNsYXNzPSJj dXN0b20tY29udHJvbC1sYWJlbCIgZm9yPSIke2lkfSI+Ci0gICAgICAgICAgICA8c3BhbiBjbGFz cz0ic3Itb25seSI+U2VsZWN0PHNwYW4+CisgICAgICAgICAgICA8c3BhbiBjbGFzcz0ic3Itb25s eSI+YCArIGdldHRleHQoJ1NlbGVjdCcpICsgYDxzcGFuPgogICAgICAgICAgIDwvbGFiZWw+CiAg ICAgICAgIDwvZGl2PmApCiAgICAgICApOwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGlj L2pzL3NxbGVkaXRvci9oaXN0b3J5L3F1ZXJ5X2hpc3RvcnlfZGV0YWlscy5qcyBiL3dlYi9wZ2Fk bWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvaGlzdG9yeS9xdWVyeV9oaXN0b3J5X2RldGFpbHMuanMK aW5kZXggOGE4ODRkYTAwLi5kNWJmYWM4NmEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRp Yy9qcy9zcWxlZGl0b3IvaGlzdG9yeS9xdWVyeV9oaXN0b3J5X2RldGFpbHMuanMKKysrIGIvd2Vi L3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9oaXN0b3J5L3F1ZXJ5X2hpc3RvcnlfZGV0YWls cy5qcwpAQCAtMTI4LDcgKzEyOCw3IEBAIGV4cG9ydCBkZWZhdWx0IGNsYXNzIFF1ZXJ5SGlzdG9y eURldGFpbHMgewogICAgICAgdGhpcy4kZXJyTXNnQmxvY2sucmVtb3ZlQ2xhc3MoJ2Qtbm9uZScp OwogICAgICAgdGhpcy4kZXJyTXNnQmxvY2suZW1wdHkoKS5hcHBlbmQoCiAgICAgICAgIGA8ZGl2 IGNsYXNzPSdoaXN0b3J5LWVycm9yLXRleHQnPgotICAgICAgICAgICAgPHNwYW4+RXJyb3IgTWVz c2FnZTwvc3Bhbj4gJHtfLmVzY2FwZSh0aGlzLnBhcnNlRXJyb3JNZXNzYWdlKHRoaXMuZW50cnku bWVzc2FnZSkpfQorICAgICAgICAgICAgPHNwYW4+YCArIGdldHRleHQoJ0Vycm9yIE1lc3NhZ2Un KSArIGA8L3NwYW4+ICR7Xy5lc2NhcGUodGhpcy5wYXJzZUVycm9yTWVzc2FnZSh0aGlzLmVudHJ5 Lm1lc3NhZ2UpKX0KICAgICAgICAgPC9kaXY+YAogICAgICAgKTsKICAgICB9IGVsc2UgewpkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL3ZlbmRvci9iYWNrZ3JpZC9iYWNrZ3JpZC1zZWxl Y3QtYWxsLmpzIGIvd2ViL3BnYWRtaW4vc3RhdGljL3ZlbmRvci9iYWNrZ3JpZC9iYWNrZ3JpZC1z ZWxlY3QtYWxsLmpzCmluZGV4IDhjYzExNjk4Yi4uYWI4ODJmMzY0IDEwMDY0NAotLS0gYS93ZWIv cGdhZG1pbi9zdGF0aWMvdmVuZG9yL2JhY2tncmlkL2JhY2tncmlkLXNlbGVjdC1hbGwuanMKKysr IGIvd2ViL3BnYWRtaW4vc3RhdGljL3ZlbmRvci9iYWNrZ3JpZC9iYWNrZ3JpZC1zZWxlY3QtYWxs LmpzCkBAIC0xMjYsNyArMTI2LDcgQEAKICAgICAgICAgJzxkaXYgY2xhc3M9ImN1c3RvbS1jb250 cm9sIGN1c3RvbS1jaGVja2JveCBjdXN0b20tY2hlY2tib3gtbm8tbGFiZWwiPicsCiAgICAgICAg ICcgIDxpbnB1dCB0YWJpbmRleD0iMCIgdHlwZT0iY2hlY2tib3giIGNsYXNzPSJjdXN0b20tY29u dHJvbC1pbnB1dCIgaWQ9IicrIGlkICsnIiAvPicsCiAgICAgICAgICcgIDxsYWJlbCBjbGFzcz0i Y3VzdG9tLWNvbnRyb2wtbGFiZWwiIGZvcj0iJysgaWQgKyciPicsCi0gICAgICAgICcgICAgPHNw YW4gY2xhc3M9InNyLW9ubHkiPlNlbGVjdCBBbGw8c3Bhbj4nLAorICAgICAgICAnICAgIDxzcGFu IGNsYXNzPSJzci1vbmx5Ij4nICsgZ2V0dGV4dCgnU2VsZWN0IEFsbCcpICsgJzxzcGFuPicsCiAg ICAgICAgICcgIDwvbGFiZWw+JywKICAgICAgICAgJzwvZGl2PicKICAgICAgIF0uam9pbignXG4n KSk7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9zZWFyY2hfb2JqZWN0cy9zdGF0aWMv anMvc2VhcmNoX29iamVjdHNfZGlhbG9nX3dyYXBwZXIuanMgYi93ZWIvcGdhZG1pbi90b29scy9z ZWFyY2hfb2JqZWN0cy9zdGF0aWMvanMvc2VhcmNoX29iamVjdHNfZGlhbG9nX3dyYXBwZXIuanMK aW5kZXggMGM0YTMxNWRiLi42YzNiNGZhMzkgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xz L3NlYXJjaF9vYmplY3RzL3N0YXRpYy9qcy9zZWFyY2hfb2JqZWN0c19kaWFsb2dfd3JhcHBlci5q cworKysgYi93ZWIvcGdhZG1pbi90b29scy9zZWFyY2hfb2JqZWN0cy9zdGF0aWMvanMvc2VhcmNo X29iamVjdHNfZGlhbG9nX3dyYXBwZXIuanMKQEAgLTE1MCw4ICsxNTAsNyBAQCBleHBvcnQgZGVm YXVsdCBjbGFzcyBTZWFyY2hPYmplY3RzRGlhbG9nV3JhcHBlciBleHRlbmRzIERpYWxvZ1dyYXBw ZXIgewogICAgIGlmKGNvdW50ICE9IDAgJiYgIWNvdW50KSB7CiAgICAgICBjb3VudCA9IGdldHRl eHQoJ1Vua25vd24nKTsKICAgICB9Ci0gICAgdGhpcy5zZWFyY2hSZXN1bHRDb3VudC5pbm5lckhU TUwgPSBjb3VudCArICcgJyArCi0gICAgICAoY291bnQ9PT0xID8gZ2V0dGV4dCgnbWF0Y2ggZm91 bmQuJyk6IGdldHRleHQoJ21hdGNoZXMgZm91bmQuJykpOworICAgIHRoaXMuc2VhcmNoUmVzdWx0 Q291bnQuaW5uZXJIVE1MID0gKGNvdW50PT09MSA/IGdldHRleHQoJyVzIG1hdGNoIGZvdW5kLics IGNvdW50KTogZ2V0dGV4dCgnJXMgbWF0Y2hlcyBmb3VuZC4nLCBjb3VudCkpOwogICB9CiAKICAg c2hvd090aGVySW5mbyhyb3dubykgewpAQCAtMjU2LDggKzI1NSw3IEBAIGV4cG9ydCBkZWZhdWx0 IGNsYXNzIFNlYXJjaE9iamVjdHNEaWFsb2dXcmFwcGVyIGV4dGVuZHMgRGlhbG9nV3JhcHBlciB7 CiAKICAgICAgIGlmKCFyb3dEYXRhLnNob3dfbm9kZSkgewogICAgICAgICB0aGlzLnNob3dNZXNz YWdlKAotICAgICAgICAgIGdldHRleHQoJyVzIG9iamVjdHMgYXJlIGRpc2FibGVkIGluIHRoZSBi cm93c2VyLicsIHJvd0RhdGEudHlwZV9sYWJlbCkgKyAnICcgKwotICAgICAgICAgIGdldHRleHQo J1lvdSBjYW4gZW5hYmxlIHRoZW0gaW4gdGhlJykgKyAnIDxhIGNsYXNzPSJwcmVmLWRpYWxvZy1s aW5rIj4nICsgZ2V0dGV4dCgncHJlZmVyZW5jZXMgZGlhbG9nJykgKyAnPC9hPi4nLAorICAgICAg ICAgIGdldHRleHQoJyVzIG9iamVjdHMgYXJlIGRpc2FibGVkIGluIHRoZSBicm93c2VyLiBZb3Ug Y2FuIGVuYWJsZSB0aGVtIGluIHRoZSA8YSBjbGFzcz0icHJlZi1kaWFsb2ctbGluayI+cHJlZmVy ZW5jZXMgZGlhbG9nPC9hPi4nLCByb3dEYXRhLnR5cGVfbGFiZWwpLAogICAgICAgICAgIHRydWUs CiAgICAgICAgICAgKHN0YXR1c0Jhcik9PnsKICAgICAgICAgICAgIHN0YXR1c0Jhci5xdWVyeVNl bGVjdG9yKCcucHJlZi1kaWFsb2ctbGluaycpLmFkZEV2ZW50TGlzdGVuZXIoJ2NsaWNrJywgKCk9 PnsKQEAgLTQ2NSw3ICs0NjMsNyBAQCBleHBvcnQgZGVmYXVsdCBjbGFzcyBTZWFyY2hPYmplY3Rz RGlhbG9nV3JhcHBlciBleHRlbmRzIERpYWxvZ1dyYXBwZXIgewogICAgICkudGhlbigocmVzKT0+ ewogICAgICAgbGV0IHR5cGVzID0gW3sKICAgICAgICAgaWQ6ICdhbGwnLAotICAgICAgICB0ZXh0 OiAnQWxsIHR5cGVzJywKKyAgICAgICAgdGV4dDogZ2V0dGV4dCgnQWxsIHR5cGVzJyksCiAgICAg ICB9XTsKIAogICAgICAgZm9yIChjb25zdCBrZXkgb2YgT2JqZWN0LmtleXMocmVzLmRhdGEuZGF0 YSkuc29ydCgpKSB7Cg== --00000000000026e7c505a3a3d099--