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 1jObEF-00073M-3M for pgadmin-hackers@arkaria.postgresql.org; Wed, 15 Apr 2020 06:08:55 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1jObEE-0000CG-0t for pgadmin-hackers@arkaria.postgresql.org; Wed, 15 Apr 2020 06:08:54 +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 1jObED-0000BW-Ac for pgadmin-hackers@lists.postgresql.org; Wed, 15 Apr 2020 06:08:53 +0000 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1jObEA-0008Fl-Kj for pgadmin-hackers@postgresql.org; Wed, 15 Apr 2020 06:08:52 +0000 Received: by mail-ed1-x534.google.com with SMTP id v1so3146114edq.8 for ; Tue, 14 Apr 2020 23:08:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=H/9ROCJZPp8tjelXKUgdjU2GVOIrWammas8HyTacGp8=; b=ipSLNblsageA6ReLlvsNxxyMvlk7aCY5IiwLgqZvnmS7PRTGTQ1GTc9WYGRs5BA0XH O9BkKUA7ZekWG3MqwivZ6L9RjO2h+Vzmno6op0pFqNY6UN54XQOGtzOUYXaEV+P5uOct T1o1Y9Q99O61u7x+ICtF+m335fB3EoSHRilhecklWTu2t+zJzsEfXs4PQ7yQxiE2/Ie9 CoXFvqc2s70709CeYgu6HYi0HpIFPzemyPzflVJ8ani6Qf1bGgHc0QJKCCIEZrpVD/9X yxMbdjdpJInhg/FG/QQtqGXX+JWo721pvfjx7UjnMoLuUirEJj673nyx2JFbIERSzLEJ 3jsQ== 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=H/9ROCJZPp8tjelXKUgdjU2GVOIrWammas8HyTacGp8=; b=feNFBZUR9SQSpokz+oM2qpCmoF6Szto8T1Il0s8gwfg7+V5AU29JCN0QEw3qKsPEuu 7Hk31RjZtgvvyssc/WzjnT+/hMd61N1MUK52nX7y+aKvkW6q12FIWOfM5wxg5MDtTze9 fmZ//38W9NDGiUKXVjDgGv2AUnbcrd+Bad39EPnX9rZy+s19TMuXSlkDgfatwCu4+v/8 wOYDL8vqaUxQUHx/BKzMyVAOzy1VsaZ4l0/4hatSxg0qbEmsDGoPHoUs78Az45GsHT6T 2Lxdstw1pk/8/iWPaodNSiCAZLANjDa1+cv3hMHNXyaCvl+uCm2fPqwnEWP5phxLtT4C lv0g== X-Gm-Message-State: AGi0PuZu0JNQPpfdBrGlzRlaZl/sOE2UobAvyQHyzhbun3SrtqGNKK1n j6FQkm5SQ2vrT7OLzFwgcg3Tfm25L9sIPL/NtVcWlxlEnfgG4VigJlUFgF1BvJE5IAVVk5ZGsfg 4XiO5G10G0Qjv7ZQ9CTPc0bz2AwYmz+LvBfuFoQEphfqB+fMuvmRHxhJqCoCqr5v/4d0yh5Zwxn ev8IXY4cyugA4SMscxftVJlHZScoef73DrQcM4GBlS+iaVFkgUPwg= X-Google-Smtp-Source: APiQypLME5B/WKHnJMRqUNQGpAu4yP1AYOss+Gl7jVs2CXGEUbbIW1Jv2xmEtuldYI9ziZtwp1g/KVZcjtXZ77nEewg= X-Received: by 2002:a17:907:20b5:: with SMTP id pw21mr3327657ejb.227.1586930928638; Tue, 14 Apr 2020 23:08:48 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Aditya Toshniwal Date: Wed, 15 Apr 2020 11:38:11 +0530 Message-ID: Subject: Re: pgAdmin 4 - next gettext usage fixes To: Akshay Joshi Cc: "Libor M." , pgadmin-hackers Content-Type: multipart/mixed; boundary="00000000000049915a05a34e2611" X-CLOUD-SEC-AV-Info: edb,google_mail,monitor X-CLOUD-SEC-AV-Sent: true X-Gm-Spam: 0 X-Gm-Phishy: 0 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --00000000000049915a05a34e2611 Content-Type: multipart/alternative; boundary="00000000000049915805a34e260f" --00000000000049915805a34e260f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 format() 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 before > 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 sentence= 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* > --=20 Thanks and Regards, Aditya Toshniwal pgAdmin Hacker | Sr. Software Engineer | EnterpriseDB India | Pune "Don't Complain about Heat, Plant a TREE" --00000000000049915805a34e260f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Hackers/Libor,

The changes like below = are incorrect. Try "Count rows" from a table's context menu.<= /div>
=

-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 info=3Dg= ettext("Table rows counted: %s" % count),

+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 info=3Dg= ettext("Table rows counted: %s") % count,

<= div>
<= br>
Attached is the patch to fix all such changes in pgAdmin, to use format= () instead.
Please review.

On Fri, Apr 10, 2020 at 2:57 PM Akshay Jos= hi <akshay.joshi@enterp= risedb.com> wrote:
Hi=C2=A0Libor

Thanks, patch = applied. Please make sure to run the PEP8 checks before sending the patch.<= /div>
I have fixed and committed the code.

On Wed, Apr 8, 2020 at = 9:30 PM Libor M. <liborm85@gmail.com> 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 t= o
be translated in Czech language as 'zru=C5=A1it' but in another sen= tence as
'zru=C5=A1en=C3=AD')
- added gettext for text translations

Diff file is attached.

Best regards,

Libor M.

E-mail: liborm85@gm= ail.com
GitHub: https://github.com/liborm85


--
Thanks & Regards
Akshay Joshi
<= font color=3D"#3333FF">Sr. Software Architect=
<= font color=3D"#000000" face=3D"arial, sans-serif">EnterpriseDB Software = India Private Limited
Mobile: +91 976-788-8246=


--
Thanks and Regards,Aditya Toshniwal
pgAdmin Hacker | Sr. S= oftware Engineer |=C2=A0EnterpriseDB India |=C2=A0Pune
"Don't Complain about Heat= , Plant a TREE"
=
--00000000000049915805a34e260f-- --00000000000049915a05a34e2611 Content-Type: application/octet-stream; name="gettext_format_fixes.patch" Content-Disposition: attachment; filename="gettext_format_fixes.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k90xnqy00 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vX19pbml0 X18ucHkKaW5kZXggZWY2NDYxZWU0Li5kZDVmYzA1MzUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWlu L19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL19faW5pdF9fLnB5CkBAIC01MDMsMTMgKzUw MywxMyBAQCBkZWYgY3JlYXRlX2FwcChhcHBfbmFtZT1Ob25lKToKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBzdnJfZGlzY292ZXJ5X2lkID0gaW5zdF9pZAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHN2cl9jb21tZW50ID0gZ2V0dGV4dCgKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIkF1dG8tZGV0ZWN0ZWQgJXMgaW5zdGFsbGF0aW9uIHdpdGggdGhlIGRhdGEgIgot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiZGlyZWN0b3J5IGF0ICVzIikgJSAoCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJkaXJlY3RvcnkgYXQge30iLmZvcm1hdCgK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdpbnJlZy5RdWVyeVZhbHVlRXgo CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5zdF9rZXksICdEaXNw bGF5IE5hbWUnCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICApWzBdLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2lucmVnLlF1ZXJ5VmFsdWVFeCgKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnN0X2tleSwgJ0RhdGEgRGly ZWN0b3J5JwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKVswXSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIClbMF0pKQogCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYWRkX3NlcnZlcigKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dXNlcl9pZCwgc2VydmVyZ3JvdXBfaWQsIHN2cl9uYW1lLApAQCAtNTU3LDExICs1NTcsMTIgQEAg ZGVmIGNyZWF0ZV9hcHAoYXBwX25hbWU9Tm9uZSk6CiAgICAgICAgICAgICAgICAgICAgIGlmIGhh c2F0dHIoc3RyLCAnZGVjb2RlJyk6CiAgICAgICAgICAgICAgICAgICAgICAgICBkZXNjcmlwdGlv biA9IGRlc2NyaXB0aW9uLmRlY29kZSgndXRmLTgnKQogICAgICAgICAgICAgICAgICAgICAgICAg ZGF0YV9kaXJlY3RvcnkgPSBkYXRhX2RpcmVjdG9yeS5kZWNvZGUoJ3V0Zi04JykKLSAgICAgICAg ICAgICAgICAgICAgc3ZyX2NvbW1lbnQgPSBnZXR0ZXh0KHUiQXV0by1kZXRlY3RlZCAlcyBpbnN0 YWxsYXRpb24gIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdSJ3 aXRoIHRoZSBkYXRhIGRpcmVjdG9yeSBhdCAlcyIpICUgKAorICAgICAgICAgICAgICAgICAgICBz dnJfY29tbWVudCA9IGdldHRleHQodSJBdXRvLWRldGVjdGVkIHswfSBpbnN0YWxsYXRpb24gIgor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdSJ3aXRoIHRoZSBkYXRh IGRpcmVjdG9yeSBhdCB7MX0iLgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZm9ybWF0KAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGRlc2NyaXB0aW9uLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGRhdGFfZGlyZWN0b3J5Ci0gICAgICAgICAgICAgICAgICAgICkKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICkpCiAgICAgICAgICAgICAgICAgICAgIGFk ZF9zZXJ2ZXIodXNlcl9pZCwgc2VydmVyZ3JvdXBfaWQsIHN2cl9uYW1lLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHN2cl9zdXBlcnVzZXIsIHN2cl9wb3J0LCBzdnJfZGlzY292ZXJ5 X2lkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN2cl9jb21tZW50KQpkaWZmIC0t Z2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvX19pbml0X18u cHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9fX2luaXRfXy5w eQppbmRleCBkNjJkNjkxMzguLjU5ZWZhZThiMSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4v YnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvX19pbml0X18ucHkKQEAgLTczNyw3ICs3Mzcs OCBAQCBjbGFzcyBTZXJ2ZXJOb2RlKFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAgICAgICAg ICAgIHN0YXR1cz00MTAsCiAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAg ICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0dGV4dCgKLSAgICAgICAgICAgICAgICAgICAgICAgICJD b3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIikgJSBhcmcKKyAgICAg ICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVy ICh7fSkuIi4KKyAgICAgICAgICAgICAgICAgICAgICAgIGZvcm1hdChhcmcpKQogICAgICAgICAg ICAgICAgICkKIAogICAgICAgICBpZiAnaG9zdGFkZHInIGluIGRhdGEgYW5kIGRhdGFbJ2hvc3Rh ZGRyJ10gYW5kIGRhdGFbJ2hvc3RhZGRyJ10gIT0gJyc6CkBAIC04MzUsNyArODM2LDggQEAgY2xh c3MgU2VydmVyTm9kZShQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICAgICAgICAgICAgICAgICAg c3RhdHVzPTQwMSwKICAgICAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAg ICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgdSJVbmFibGUgdG8gY29ubmVjdCB0byBzZXJ2ZXI6XG5cbiVzIikgJSBlcnJtc2cKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICB1IlVuYWJsZSB0byBjb25uZWN0IHRvIHNlcnZlcjpc blxue30iLgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZvcm1hdChlcnJtc2cpKQogICAg ICAgICAgICAgICAgICAgICApCiAgICAgICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAg ICAgICAgaWYgJ3NhdmVfcGFzc3dvcmQnIGluIGRhdGEgYW5kIGRhdGFbJ3NhdmVfcGFzc3dvcmQn XSBhbmQgXApAQCAtMTAyNyw3ICsxMDI5LDcgQEAgY2xhc3MgU2VydmVyTm9kZShQR0NoaWxkTm9k ZVZpZXcpOgogICAgICAgICAgICAgICAgICAgICB0dW5uZWxfcGFzc3dvcmQgPSBzZXJ2ZXIudHVu bmVsX3Bhc3N3b3JkCiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgIHR1bm5lbF9w YXNzd29yZCA9IGRhdGFbJ3R1bm5lbF9wYXNzd29yZCddIFwKLSAgICAgICAgICAgICAgICAgICAg aWYgJ3R1bm5lbF9wYXNzd29yZCdpbiBkYXRhIGVsc2UgJycKKyAgICAgICAgICAgICAgICAgICAg aWYgJ3R1bm5lbF9wYXNzd29yZCcgaW4gZGF0YSBlbHNlICcnCiAgICAgICAgICAgICAgICAgc2F2 ZV90dW5uZWxfcGFzc3dvcmQgPSBkYXRhWydzYXZlX3R1bm5lbF9wYXNzd29yZCddIFwKICAgICAg ICAgICAgICAgICAgICAgaWYgdHVubmVsX3Bhc3N3b3JkIGFuZCAnc2F2ZV90dW5uZWxfcGFzc3dv cmQnIGluIGRhdGEgXAogICAgICAgICAgICAgICAgICAgICBlbHNlIEZhbHNlCmRpZmYgLS1naXQg YS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvX19p bml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvX19pbml0X18ucHkKaW5kZXggMDg1ZWUzNWI2Li5kYjZlMTI3M2EgMTAwNjQ0Ci0tLSBh L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9fX2lu aXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9k YXRhYmFzZXMvX19pbml0X18ucHkKQEAgLTU2Nyw3ICs1NjcsOCBAQCBjbGFzcyBEYXRhYmFzZVZp ZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQxMCwKICAg ICAgICAgICAgICAgICAgICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAgICAgICAgICBlcnJvcm1z Zz1fKAotICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJl ZCBwYXJhbWV0ZXIgKCVzKS4iKSAlIGFyZworICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxk IG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKHt9KS4iLgorICAgICAgICAgICAgICAg ICAgICAgICAgZm9ybWF0KGFyZykpCiAgICAgICAgICAgICAgICAgKQogICAgICAgICAjIFRoZSBi ZWxvdyBTUUwgd2lsbCBleGVjdXRlIENSRUFURSBEREwgb25seQogICAgICAgICBTUUwgPSByZW5k ZXJfdGVtcGxhdGUoCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91 cHMvc2VydmVycy9kYXRhYmFzZXMvY2FzdHMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvY2FzdHMvX19pbml0X18ucHkKaW5k ZXggNTAzMTkyY2IyLi41NTU4ZDk3ZjggMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9jYXN0cy9fX2luaXRfXy5weQorKysgYi93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvY2FzdHMv X19pbml0X18ucHkKQEAgLTM2OCw3ICszNjgsOCBAQCBjbGFzcyBDYXN0VmlldyhQR0NoaWxkTm9k ZVZpZXcpOgogICAgICAgICAgICAgICAgICAgICBzdGF0dXM9NDEwLAogICAgICAgICAgICAgICAg ICAgICBzdWNjZXNzPTAsCiAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0g ICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFt ZXRlciAoJXMpLiIpICUgYXJnCisgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZp bmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoe30pLiIuCisgICAgICAgICAgICAgICAgICAgICAg ICBmb3JtYXQoYXJnKSkKICAgICAgICAgICAgICAgICApCiAgICAgICAgIHRyeToKICAgICAgICAg ICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCAn Y3JlYXRlLnNxbCddKSwKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9ldmVudF90cmlnZ2Vycy9fX2luaXRfXy5weSBiL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9ldmVudF90cmln Z2Vycy9fX2luaXRfXy5weQppbmRleCA0MmRhNGNmYzQuLjQ1ZjExZTY1NSAxMDA2NDQKLS0tIGEv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2V2ZW50 X3RyaWdnZXJzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9ldmVudF90cmlnZ2Vycy9fX2luaXRfXy5weQpAQCAtMzc4 LDcgKzM3OCw3IEBAIGNsYXNzIEV2ZW50VHJpZ2dlclZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAg ICAgICAgICAgICAgICBzdGF0dXM9NDAwLAogICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAg ICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0KAotICAgICAgICAgICAgICAgICAgICAiQ291 bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAlcy4iKSAlIGVycgorICAgICAgICAg ICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciB7fS4iLmZv cm1hdChlcnIpKQogICAgICAgICAgICAgKQogICAgICAgICB0cnk6CiAgICAgICAgICAgICBzcWwg PSByZW5kZXJfdGVtcGxhdGUoCkBAIC02MzYsNyArNjM2LDggQEAgY2xhc3MgRXZlbnRUcmlnZ2Vy VmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICAgICAgICAgICAgICBzdGF0dXM9NDEwLAog ICAgICAgICAgICAgICAgICAgICBzdWNjZXNzPTAsCiAgICAgICAgICAgICAgICAgICAgIGVycm9y bXNnPWdldHRleHQoCi0gICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhl IHJlcXVpcmVkIHBhcmFtZXRlciAlcy4iKSAlIGVycgorICAgICAgICAgICAgICAgICAgICAgICAg IkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIge30uIi4KKyAgICAgICAgICAg ICAgICAgICAgICAgIGZvcm1hdChlcnIpKQogICAgICAgICAgICAgICAgICkKICAgICAgICAgICAg IHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgKICAgICAgICAgICAgICAgICAiLyIuam9pbihbc2VsZi50 ZW1wbGF0ZV9wYXRoLCAnY3JlYXRlLnNxbCddKSwKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jy b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9leHRlbnNpb25zL19faW5pdF9f LnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L2V4dGVuc2lvbnMvX19pbml0X18ucHkKaW5kZXggOTYwNWI5YjRhLi5mMTliMzQ1MmUgMTAwNjQ0 Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9leHRlbnNpb25zL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVy X2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9leHRlbnNpb25zL19faW5pdF9fLnB5CkBAIC0yNjIs NyArMjYyLDggQEAgY2xhc3MgRXh0ZW5zaW9uVmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAg ICAgICAgICAgICAgICBzdGF0dXM9NDEwLAogICAgICAgICAgICAgICAgICAgICBzdWNjZXNzPTAs CiAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0gICAgICAgICAgICAgICAg ICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIpICUg YXJnCisgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVk IHBhcmFtZXRlciAoe30pLiIuCisgICAgICAgICAgICAgICAgICAgICAgICBmb3JtYXQoYXJnKSkK ICAgICAgICAgICAgICAgICApCiAKICAgICAgICAgc3RhdHVzLCByZXMgPSBzZWxmLmNvbm4uZXhl Y3V0ZV9kaWN0KApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvZGF0YWJhc2VzL2ZvcmVpZ25fZGF0YV93cmFwcGVycy9fX2luaXRfXy5weSBiL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9mb3JlaWdu X2RhdGFfd3JhcHBlcnMvX19pbml0X18ucHkKaW5kZXggZTViZjA2MzU3Li5iYjhkNTQ4MmYgMTAw NjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFi YXNlcy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4v YnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2ZvcmVpZ25fZGF0YV93cmFw cGVycy9fX2luaXRfXy5weQpAQCAtMzkzLDcgKzM5Myw4IEBAIGNsYXNzIEZvcmVpZ25EYXRhV3Jh cHBlclZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQx MCwKICAgICAgICAgICAgICAgICAgICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAgICAgICAgICBl cnJvcm1zZz1nZXR0ZXh0KAotICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5k IHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iKSAlIGFyZworICAgICAgICAgICAgICAgICAg ICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKHt9KS4iLgorICAg ICAgICAgICAgICAgICAgICAgICAgZm9ybWF0KGFyZykpCiAgICAgICAgICAgICAgICAgKQogCiAg ICAgICAgIHRyeToKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvZm9yZWlnbl9zZXJ2ZXJz L19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL2ZvcmVpZ25fZGF0YV93cmFwcGVycy9mb3JlaWduX3NlcnZlcnMvX19pbml0X18u cHkKaW5kZXggNjZmY2Y0MjRiLi5hY2YwNzYxN2EgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jy b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9mb3JlaWduX2RhdGFfd3JhcHBl cnMvZm9yZWlnbl9zZXJ2ZXJzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvZm9y ZWlnbl9zZXJ2ZXJzL19faW5pdF9fLnB5CkBAIC0zODgsNyArMzg4LDggQEAgY2xhc3MgRm9yZWln blNlcnZlclZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgICAgICAgICAgc3RhdHVz PTQxMCwKICAgICAgICAgICAgICAgICAgICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAgICAgICAg ICBlcnJvcm1zZz1nZXR0ZXh0KAotICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBm aW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iKSAlIGFyZworICAgICAgICAgICAgICAg ICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKHt9KS4iLgor ICAgICAgICAgICAgICAgICAgICAgICAgZm9ybWF0KGFyZykpCiAgICAgICAgICAgICAgICAgKQog ICAgICAgICB0cnk6CiAgICAgICAgICAgICBpZiAnZnNydmFjbCcgaW4gZGF0YToKZGlmZiAtLWdp dCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9m b3JlaWduX2RhdGFfd3JhcHBlcnMvZm9yZWlnbl9zZXJ2ZXJzL3VzZXJfbWFwcGluZ3MvX19pbml0 X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz ZXMvZm9yZWlnbl9kYXRhX3dyYXBwZXJzL2ZvcmVpZ25fc2VydmVycy91c2VyX21hcHBpbmdzL19f aW5pdF9fLnB5CmluZGV4IDQ3ZTU1NTcwYS4uMWVlNjZlYWRlIDEwMDY0NAotLS0gYS93ZWIvcGdh ZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZm9yZWlnbl9kYXRh X3dyYXBwZXJzL2ZvcmVpZ25fc2VydmVycy91c2VyX21hcHBpbmdzL19faW5pdF9fLnB5CisrKyBi L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9mb3Jl aWduX2RhdGFfd3JhcHBlcnMvZm9yZWlnbl9zZXJ2ZXJzL3VzZXJfbWFwcGluZ3MvX19pbml0X18u cHkKQEAgLTM5Niw3ICszOTYsOCBAQCBjbGFzcyBVc2VyTWFwcGluZ1ZpZXcoUEdDaGlsZE5vZGVW aWV3KToKICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQxMCwKICAgICAgICAgICAgICAgICAg ICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0KAotICAg ICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0 ZXIgKCVzKS4iKSAlIGFyZworICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5k IHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKHt9KS4iLgorICAgICAgICAgICAgICAgICAgICAgICAg Zm9ybWF0KGFyZykpCiAgICAgICAgICAgICAgICAgKQogCiAgICAgICAgIHRyeToKZGlmZiAtLWdp dCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9s YW5ndWFnZXMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy9kYXRhYmFzZXMvbGFuZ3VhZ2VzL19faW5pdF9fLnB5CmluZGV4IDc3ZjIyZTZmYS4u ZDVlZDllMjk3IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy9kYXRhYmFzZXMvbGFuZ3VhZ2VzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9sYW5ndWFnZXMvX19pbml0 X18ucHkKQEAgLTQ1Myw3ICs0NTMsOCBAQCBjbGFzcyBMYW5ndWFnZVZpZXcoUEdDaGlsZE5vZGVW aWV3KToKICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQxMCwKICAgICAgICAgICAgICAgICAg ICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0KAotICAg ICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0 ZXIgKCVzKS4iKSAlIGFyZworICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5k IHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKHt9KS4iLgorICAgICAgICAgICAgICAgICAgICAgICAg Zm9ybWF0KGFyZykpCiAgICAgICAgICAgICAgICAgKQogCiAgICAgICAgIHRyeToKZGlmZiAtLWdp dCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9z Y2hlbWFzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl cnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvX19pbml0X18ucHkKaW5kZXggMzhjZGVjMDJjLi42Nzgz NWI0MzEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2 ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dz ZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL19faW5pdF9fLnB5CkBA IC01NzAsOCArNTcwLDggQEAgSXQgbWF5IGhhdmUgYmVlbiByZW1vdmVkIGJ5IGFub3RoZXIgdXNl ci4KICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQxMCwKICAgICAgICAgICAgICAgICAgICAg c3VjY2Vzcz0wLAogICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0KAotICAgICAg ICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIg KCVzKS4iKSAlCi0gICAgICAgICAgICAgICAgICAgIHJlcXVpcmVkX2FyZ3NbYXJnXQorICAgICAg ICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIg KHt9KS4iLgorICAgICAgICAgICAgICAgICAgICAgICAgZm9ybWF0KHJlcXVpcmVkX2FyZ3NbYXJn XSkpCiAgICAgICAgICAgICAgICAgKQogICAgICAgICB0cnk6CiAgICAgICAgICAgICBzZWxmLmZv cm1hdF9yZXF1ZXN0X2FjbHMoZGF0YSkKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2NvbGxhdGlvbnMvX19pbml0 X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz ZXMvc2NoZW1hcy9jb2xsYXRpb25zL19faW5pdF9fLnB5CmluZGV4IDhjZjcwMzk4Ny4uODlmN2Fl NTQ3IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9kYXRhYmFzZXMvc2NoZW1hcy9jb2xsYXRpb25zL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2NvbGxh dGlvbnMvX19pbml0X18ucHkKQEAgLTQ1OCw3ICs0NTgsOCBAQCBjbGFzcyBDb2xsYXRpb25WaWV3 KFBHQ2hpbGROb2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBhcmUpOgogICAgICAgICAgICAg ICAgICAgICBzdGF0dXM9NDEwLAogICAgICAgICAgICAgICAgICAgICBzdWNjZXNzPTAsCiAgICAg ICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0gICAgICAgICAgICAgICAgICAgICAg ICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIpICUgYXJnCisg ICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFt ZXRlciAoe30pLiIuCisgICAgICAgICAgICAgICAgICAgICAgICBmb3JtYXQoYXJnKSkKICAgICAg ICAgICAgICAgICApCiAgICAgICAgIGlmIHNlbGYuX2NoZWNrX2RlZmluaXRpb24oZGF0YSk6CiAg ICAgICAgICAgICByZXR1cm4gbWFrZV9qc29uX3Jlc3BvbnNlKApkaWZmIC0tZ2l0IGEvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRz X2NvbmZpZ3VyYXRpb25zL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRzX2NvbmZpZ3VyYXRpb25zL19faW5p dF9fLnB5CmluZGV4IDM2MmY3YzZjZS4uMTY5ZDhkYTNmIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1p bi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mdHNfY29u ZmlndXJhdGlvbnMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRzX2NvbmZpZ3VyYXRpb25zL19faW5p dF9fLnB5CkBAIC00MjIsNyArNDIyLDggQEAgY2xhc3MgRnRzQ29uZmlndXJhdGlvblZpZXcoUEdD aGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICAgICAg ICAgIHN0YXR1cz00MTAsCiAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAg ICAgICAgICAgICAgZXJyb3Jtc2c9XygKLSAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBu b3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIikgJSBhcmcKKyAgICAgICAgICAg ICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICh7fSku Ii4KKyAgICAgICAgICAgICAgICAgICAgICAgIGZvcm1hdChhcmcpKQogICAgICAgICAgICAgICAg ICkKIAogICAgICAgICAjIEVpdGhlciBjb3B5IGNvbmZpZyBvciBwYXJzZXIgbXVzdCBiZSBwcmVz ZW50IGluIGRhdGEKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2Z0c19wYXJzZXJzL19faW5pdF9fLnB5IGIvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMv ZnRzX3BhcnNlcnMvX19pbml0X18ucHkKaW5kZXggYjc5YjZlZjViLi4wZjBiMWY2YmIgMTAwNjQ0 Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9zY2hlbWFzL2Z0c19wYXJzZXJzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dz ZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2Z0c19wYXJzZXJzL19f aW5pdF9fLnB5CkBAIC0zNzksNyArMzc5LDggQEAgY2xhc3MgRnRzUGFyc2VyVmlldyhQR0NoaWxk Tm9kZVZpZXcsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToKICAgICAgICAgICAgICAgICAgICAg c3RhdHVzPTQxMCwKICAgICAgICAgICAgICAgICAgICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAg ICAgICAgICBlcnJvcm1zZz1fKAotICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBm aW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iKSAlIGFyZworICAgICAgICAgICAgICAg ICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKHt9KS4iLgor ICAgICAgICAgICAgICAgICAgICAgICAgZm9ybWF0KGFyZykpCiAgICAgICAgICAgICAgICAgKQog ICAgICAgICAjIEZldGNoIHNjaGVtYSBuYW1lIGZyb20gc2NoZW1hIG9pZAogICAgICAgICBzcWwg PSByZW5kZXJfdGVtcGxhdGUoCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mdHNfdGVtcGxhdGVzL19faW5pdF9f LnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L3NjaGVtYXMvZnRzX3RlbXBsYXRlcy9fX2luaXRfXy5weQppbmRleCA0ZDYxZThkY2IuLjE4YmYz YjhkMiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZl cnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRzX3RlbXBsYXRlcy9fX2luaXRfXy5weQorKysgYi93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9m dHNfdGVtcGxhdGVzL19faW5pdF9fLnB5CkBAIC0zNTQsNyArMzU0LDggQEAgY2xhc3MgRnRzVGVt cGxhdGVWaWV3KFBHQ2hpbGROb2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBhcmUpOgogICAg ICAgICAgICAgICAgICAgICBzdGF0dXM9NDEwLAogICAgICAgICAgICAgICAgICAgICBzdWNjZXNz PTAsCiAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0gICAgICAgICAgICAg ICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIp ICUgYXJnCisgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVp cmVkIHBhcmFtZXRlciAoe30pLiIuCisgICAgICAgICAgICAgICAgICAgICAgICBmb3JtYXQoYXJn KSkKICAgICAgICAgICAgICAgICApCiAgICAgICAgICMgRmV0Y2ggc2NoZW1hIG5hbWUgZnJvbSBz Y2hlbWEgb2lkCiAgICAgICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi50 ZW1wbGF0ZV9wYXRoLCAnc2NoZW1hLnNxbCddKSwKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jy b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3BhY2thZ2VzL19f aW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL3NjaGVtYXMvcGFja2FnZXMvX19pbml0X18ucHkKaW5kZXggNTE5ZTMwZTk3Li5iMmE4 NTA5MGYgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2 ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3BhY2thZ2VzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3BhY2th Z2VzL19faW5pdF9fLnB5CkBAIC0zNzksNyArMzc5LDggQEAgY2xhc3MgUGFja2FnZVZpZXcoUEdD aGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICAgICAg ICAgIHN0YXR1cz00MDAsCiAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAg ICAgICAgICAgICAgZXJyb3Jtc2c9XygKLSAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBu b3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIikgJSBhcmcKKyAgICAgICAgICAg ICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICh7fSku Ii4KKyAgICAgICAgICAgICAgICAgICAgICAgIGZvcm1hdChhcmcpKQogICAgICAgICAgICAgICAg ICkKICAgICAgICAgZGF0YVsnc2NoZW1hJ10gPSBzZWxmLnNjaGVtYQogCmRpZmYgLS1naXQgYS93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1h cy9zeW5vbnltcy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3N5bm9ueW1zL19faW5pdF9fLnB5CmluZGV4IDEz NjIzYjczNy4uY2E5ZTQ2ZThhIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9zeW5vbnltcy9fX2luaXRfXy5weQor KysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMv c2NoZW1hcy9zeW5vbnltcy9fX2luaXRfXy5weQpAQCAtNDUwLDcgKzQ1MCw4IEBAIGNsYXNzIFN5 bm9ueW1WaWV3KFBHQ2hpbGROb2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBhcmUpOgogICAg ICAgICAgICAgICAgICAgICBzdGF0dXM9NDEwLAogICAgICAgICAgICAgICAgICAgICBzdWNjZXNz PTAsCiAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0gICAgICAgICAgICAg ICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIp ICUgYXJnCisgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVp cmVkIHBhcmFtZXRlciAoe30pLiIuCisgICAgICAgICAgICAgICAgICAgICAgICBmb3JtYXQoYXJn KSkKICAgICAgICAgICAgICAgICApCiAKICAgICAgICAgdHJ5OgpkaWZmIC0tZ2l0IGEvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFi bGVzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZl cnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL19faW5pdF9fLnB5CmluZGV4IGJlYTdiMzNmNC4u MmM3ZWE1NmU1IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvX19pbml0X18ucHkKKysrIGIvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFi bGVzL19faW5pdF9fLnB5CkBAIC05MDgsNyArOTA4LDggQEAgY2xhc3MgVGFibGVWaWV3KEJhc2VU YWJsZVZpZXcsIERhdGFUeXBlUmVhZGVyLCBWYWN1dW1TZXR0aW5ncywKICAgICAgICAgICAgICAg ICAgICAgc3RhdHVzPTQxMCwKICAgICAgICAgICAgICAgICAgICAgc3VjY2Vzcz0wLAogICAgICAg ICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0KAotICAgICAgICAgICAgICAgICAgICAgICAg IkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iKSAlIGFyZworICAg ICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0 ZXIgKHt9KS4iLgorICAgICAgICAgICAgICAgICAgICAgICAgZm9ybWF0KGFyZykpCiAgICAgICAg ICAgICAgICAgKQogCiAgICAgICAgICMgUGFyc2UgcHJpdmlsZWdlIGRhdGEgY29taW5nIGZyb20g Y2xpZW50IGFjY29yZGluZyB0byBkYXRhYmFzZSBmb3JtYXQKQEAgLTE1NzcsNyArMTU3OCw3IEBA IGNsYXNzIFRhYmxlVmlldyhCYXNlVGFibGVWaWV3LCBEYXRhVHlwZVJlYWRlciwgVmFjdXVtU2V0 dGluZ3MsCiAKICAgICAgICAgcmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZSgKICAgICAgICAgICAg IHN0YXR1cz0yMDAsCi0gICAgICAgICAgICBpbmZvPWdldHRleHQoIlRhYmxlIHJvd3MgY291bnRl ZDogJXMiKSAlIGNvdW50LAorICAgICAgICAgICAgaW5mbz1nZXR0ZXh0KCJUYWJsZSByb3dzIGNv dW50ZWQ6IHt9Ii5mb3JtYXQoY291bnQpKSwKICAgICAgICAgICAgIGRhdGE9eyd0b3RhbF9yb3dz JzogY291bnR9CiAgICAgICAgICkKIApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbHVtbnMvX19p bml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvc2NoZW1hcy90YWJsZXMvY29sdW1ucy9fX2luaXRfXy5weQppbmRleCAyODA5NThhOTgu LmM0NDM3NDljYyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbHVtbnMvX19pbml0X18ucHkKKysr IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3Nj aGVtYXMvdGFibGVzL2NvbHVtbnMvX19pbml0X18ucHkKQEAgLTM5Miw4ICszOTIsOCBAQCBjbGFz cyBDb2x1bW5zVmlldyhQR0NoaWxkTm9kZVZpZXcsIERhdGFUeXBlUmVhZGVyKToKICAgICAgICAg ICAgICAgICAgICAgc3RhdHVzPTQxMCwKICAgICAgICAgICAgICAgICAgICAgc3VjY2Vzcz0wLAog ICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0KAotICAgICAgICAgICAgICAgICAg ICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iKSAlCi0g ICAgICAgICAgICAgICAgICAgIHJlcXVpcmVkX2FyZ3NbYXJnXQorICAgICAgICAgICAgICAgICAg ICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKHt9KS4iLgorICAg ICAgICAgICAgICAgICAgICAgICAgZm9ybWF0KHJlcXVpcmVkX2FyZ3NbYXJnXSkpCiAgICAgICAg ICAgICAgICAgKQogCiAgICAgICAgICMgUGFyc2UgcHJpdmlsZWdlIGRhdGEgY29taW5nIGZyb20g Y2xpZW50IGFjY29yZGluZyB0byBkYXRhYmFzZSBmb3JtYXQKZGlmZiAtLWdpdCBhL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxl cy9jb21wb3VuZF90cmlnZ2Vycy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb21wb3VuZF90cmln Z2Vycy9fX2luaXRfXy5weQppbmRleCA1NTNkMDZjMzEuLjRiNTZkMGI4YyAxMDA2NDQKLS0tIGEv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVt YXMvdGFibGVzL2NvbXBvdW5kX3RyaWdnZXJzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9j b21wb3VuZF90cmlnZ2Vycy9fX2luaXRfXy5weQpAQCAtNTExLDggKzUxMSw4IEBAIGNsYXNzIENv bXBvdW5kVHJpZ2dlclZpZXcoUEdDaGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFy ZSk6CiAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MTAsCiAgICAgICAgICAgICAgICAgICAg IHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0dGV4dCgKLSAgICAg ICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVy ICglcykuIikgJQotICAgICAgICAgICAgICAgICAgICByZXF1aXJlZF9hcmdzW2FyZ10KKyAgICAg ICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVy ICh7fSkuIgorICAgICAgICAgICAgICAgICAgICAgICAgLmZvcm1hdChyZXF1aXJlZF9hcmdzW2Fy Z10pKQogICAgICAgICAgICAgICAgICkKIAogICAgICAgICAjIEFkZGluZyBwYXJlbnQgaW50byBk YXRhIGRpY3QsIHdpbGwgYmUgdXNpbmcgaXQgd2hpbGUgY3JlYXRpbmcgc3FsCmRpZmYgLS1naXQg YS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2No ZW1hcy90YWJsZXMvY29uc3RyYWludHMvY2hlY2tfY29uc3RyYWludC9fX2luaXRfXy5weSBiL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFz L3RhYmxlcy9jb25zdHJhaW50cy9jaGVja19jb25zdHJhaW50L19faW5pdF9fLnB5CmluZGV4IDJm MWJhNTdiYi4uZDY1ZDNjYzMzIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvY2hl Y2tfY29uc3RyYWludC9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvY2hl Y2tfY29uc3RyYWludC9fX2luaXRfXy5weQpAQCAtNDc2LDcgKzQ3Niw4IEBAIGNsYXNzIENoZWNr Q29uc3RyYWludFZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgICAgICAgICAgc3Rh dHVzPTQwMCwKICAgICAgICAgICAgICAgICAgICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAgICAg ICAgICBlcnJvcm1zZz1fKAotICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5k IHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iKSAlIGFyZworICAgICAgICAgICAgICAgICAg ICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKHt9KS4iLgorICAg ICAgICAgICAgICAgICAgICAgICAgZm9ybWF0KGFyZykpCiAgICAgICAgICAgICAgICAgKQogCiAg ICAgICAgIGRhdGFbJ3NjaGVtYSddID0gc2VsZi5zY2hlbWEKZGlmZiAtLWdpdCBhL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxl cy9jb25zdHJhaW50cy9leGNsdXNpb25fY29uc3RyYWludC9fX2luaXRfXy5weSBiL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxl cy9jb25zdHJhaW50cy9leGNsdXNpb25fY29uc3RyYWludC9fX2luaXRfXy5weQppbmRleCBhYjNl ZTZhYjUuLmIyYTViYmJlNSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2V4Y2x1 c2lvbl9jb25zdHJhaW50L19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9l eGNsdXNpb25fY29uc3RyYWludC9fX2luaXRfXy5weQpAQCAtNDk2LDE0ICs0OTYsMTYgQEAgY2xh c3MgRXhjbHVzaW9uQ29uc3RyYWludFZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAg ICAgICAgICAgc3RhdHVzPTQwMCwKICAgICAgICAgICAgICAgICAgICAgc3VjY2Vzcz0wLAogICAg ICAgICAgICAgICAgICAgICBlcnJvcm1zZz1fKAotICAgICAgICAgICAgICAgICAgICAgICAgIkNv dWxkIG5vdCBmaW5kIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIpICUgc3RyKGFyZykKKyAgICAg ICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCByZXF1aXJlZCBwYXJhbWV0ZXIgKHt9 KS4iLgorICAgICAgICAgICAgICAgICAgICAgICAgZm9ybWF0KHN0cihhcmcpKSkKICAgICAgICAg ICAgICAgICApCiAgICAgICAgICAgICBlbGlmIGlzaW5zdGFuY2UoZGF0YVthcmddLCBsaXN0KSBh bmQgbGVuKGRhdGFbYXJnXSkgPCAxOgogICAgICAgICAgICAgICAgIHJldHVybiBtYWtlX2pzb25f cmVzcG9uc2UoCiAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MDAsCiAgICAgICAgICAgICAg ICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9XygKLSAgICAg ICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCByZXF1aXJlZCBwYXJhbWV0ZXIgKCVz KS4iKSAlIHN0cihhcmcpCisgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQg cmVxdWlyZWQgcGFyYW1ldGVyICh7fSkuIi4KKyAgICAgICAgICAgICAgICAgICAgICAgIGZvcm1h dChzdHIoYXJnKSkpCiAgICAgICAgICAgICAgICAgKQogCiAgICAgICAgIGRhdGFbJ3NjaGVtYSdd ID0gc2VsZi5zY2hlbWEKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9mb3JlaWdu X2tleS9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2 ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9mb3JlaWduX2tleS9fX2lu aXRfXy5weQppbmRleCBkMDU3YTNmMmYuLjFhYmJjNDViMyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVz L2NvbnN0cmFpbnRzL2ZvcmVpZ25fa2V5L19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jy b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25z dHJhaW50cy9mb3JlaWduX2tleS9fX2luaXRfXy5weQpAQCAtNTE0LDE0ICs1MTQsMTYgQEAgY2xh c3MgRm9yZWlnbktleUNvbnN0cmFpbnRWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAg ICAgICAgICAgIHN0YXR1cz00MDAsCiAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAg ICAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9XygKLSAgICAgICAgICAgICAgICAgICAgICAgICJD b3VsZCBub3QgZmluZCByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iKSAlIHN0cihhcmcpCisgICAg ICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgcmVxdWlyZWQgcGFyYW1ldGVyICh7 fSkuIi4KKyAgICAgICAgICAgICAgICAgICAgICAgIGZvcm1hdChzdHIoYXJnKSkpCiAgICAgICAg ICAgICAgICAgKQogICAgICAgICAgICAgZWxpZiBpc2luc3RhbmNlKGRhdGFbYXJnXSwgbGlzdCkg YW5kIGxlbihkYXRhW2FyZ10pIDwgMToKICAgICAgICAgICAgICAgICByZXR1cm4gbWFrZV9qc29u X3Jlc3BvbnNlKAogICAgICAgICAgICAgICAgICAgICBzdGF0dXM9NDAwLAogICAgICAgICAgICAg ICAgICAgICBzdWNjZXNzPTAsCiAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPV8oCi0gICAg ICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgcmVxdWlyZWQgcGFyYW1ldGVyICgl cykuIikgJSBzdHIoYXJnKQorICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5k IHJlcXVpcmVkIHBhcmFtZXRlciAoe30pLiIuCisgICAgICAgICAgICAgICAgICAgICAgICBmb3Jt YXQoc3RyKGFyZykpKQogICAgICAgICAgICAgICAgICkKIAogICAgICAgICBkYXRhWydzY2hlbWEn XSA9IHNlbGYuc2NoZW1hCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvaW5kZXhf Y29uc3RyYWludC9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9pbmRleF9jb25z dHJhaW50L19faW5pdF9fLnB5CmluZGV4IDA1YzVmODRkMS4uYmQyOTc0YzNkIDEwMDY0NAotLS0g YS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2No ZW1hcy90YWJsZXMvY29uc3RyYWludHMvaW5kZXhfY29uc3RyYWludC9fX2luaXRfXy5weQorKysg Yi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2No ZW1hcy90YWJsZXMvY29uc3RyYWludHMvaW5kZXhfY29uc3RyYWludC9fX2luaXRfXy5weQpAQCAt NTM1LDcgKzUzNSw3IEBAIGNsYXNzIEluZGV4Q29uc3RyYWludFZpZXcoUEdDaGlsZE5vZGVWaWV3 KToKICAgICAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAg ICAgICAgIGVycm9ybXNnPV8oCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5v dCBmaW5kIGF0IGxlYXN0IG9uZSByZXF1aXJlZCAiCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgInBhcmFtZXRlciAoJXMpLiIpICUgc3RyKHBhcmFtKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICJwYXJhbWV0ZXIgKHt9KS4iLmZvcm1hdChzdHIocGFyYW0pKSkKICAgICAgICAgICAg ICAgICAgICAgKQogCiAgICAgICAgICAgICBlbGlmIGFyZyBub3QgaW4gZGF0YToKQEAgLTU0Myw3 ICs1NDMsOCBAQCBjbGFzcyBJbmRleENvbnN0cmFpbnRWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAg ICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MDAsCiAgICAgICAgICAgICAgICAgICAgIHN1Y2Nl c3M9MCwKICAgICAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9XygKLSAgICAgICAgICAgICAgICAg ICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIikgJSBh cmcKKyAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQg cGFyYW1ldGVyICh7fSkuIi4KKyAgICAgICAgICAgICAgICAgICAgICAgIGZvcm1hdChhcmcpKQog ICAgICAgICAgICAgICAgICkKIAogICAgICAgICBkYXRhWydzY2hlbWEnXSA9IHNlbGYuc2NoZW1h CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9k YXRhYmFzZXMvc2NoZW1hcy90eXBlcy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3R5cGVzL19faW5pdF9fLnB5 CmluZGV4IDAyZWIyM2IwMi4uOTcwOTMzNDc5IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90eXBlcy9fX2luaXRf Xy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvc2NoZW1hcy90eXBlcy9fX2luaXRfXy5weQpAQCAtOTQ2LDggKzk0Niw4IEBAIGNsYXNz IFR5cGVWaWV3KFBHQ2hpbGROb2RlVmlldywgRGF0YVR5cGVSZWFkZXIsIFNjaGVtYURpZmZPYmpl Y3RDb21wYXJlKToKICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQxMCwKICAgICAgICAgICAg ICAgICAgICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0 KAotICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBw YXJhbWV0ZXIgKCVzKS4iKSAlCi0gICAgICAgICAgICAgICAgICAgIHJlcXVpcmVkX2FyZ3NbYXJn XQorICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBw YXJhbWV0ZXIgKHt9KS4iLgorICAgICAgICAgICAgICAgICAgICAgICAgZm9ybWF0KHJlcXVpcmVk X2FyZ3NbYXJnXSkpCiAgICAgICAgICAgICAgICAgKQogICAgICAgICAgICAgIyBBZGRpdGlvbmFs IGNoZWNrcyBnb2VzIGhlcmUKICAgICAgICAgICAgICMgSWYgdHlwZSBpcyByYW5nZSB0aGVuIGNo ZWNrIGlmIHN1YnR5cGUgaXMgZGVmaW5lZCBvciBub3QKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3ZpZXdzL19f aW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL3NjaGVtYXMvdmlld3MvX19pbml0X18ucHkKaW5kZXggOTU1YWY4YmMxLi41ZDhkMTYy NDkgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJz L2RhdGFiYXNlcy9zY2hlbWFzL3ZpZXdzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jy b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3ZpZXdzL19faW5p dF9fLnB5CkBAIC00OTMsNyArNDkzLDggQEAgY2xhc3MgVmlld05vZGUoUEdDaGlsZE5vZGVWaWV3 LCBWYWN1dW1TZXR0aW5ncywgU2NoZW1hRGlmZk9iamVjdENvbXBhcmUpOgogICAgICAgICAgICAg ICAgICAgICBzdGF0dXM9NDEwLAogICAgICAgICAgICAgICAgICAgICBzdWNjZXNzPTAsCiAgICAg ICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0gICAgICAgICAgICAgICAgICAgICAg ICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIpICUgYXJnCisg ICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFt ZXRlciAoe30pLiIuCisgICAgICAgICAgICAgICAgICAgICAgICBmb3JtYXQoYXJnKSkKICAgICAg ICAgICAgICAgICApCiAgICAgICAgIHRyeToKICAgICAgICAgICAgIFNRTCwgbmFtZU9yRXJyb3Ig PSBzZWxmLmdldFNRTChnaWQsIHNpZCwgZGlkLCBkYXRhKQpAQCAtNzQzLDcgKzc0NCw3IEBAIGNs YXNzIFZpZXdOb2RlKFBHQ2hpbGROb2RlVmlldywgVmFjdXVtU2V0dGluZ3MsIFNjaGVtYURpZmZP YmplY3RDb21wYXJlKToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICkuc3BsaXQo J0ZST00nKQogICAgICAgICAgICAgICAgIGlmICdkZWZpbml0aW9uJyBpbiBkYXRhIGFuZCAoCiAg ICAgICAgICAgICAgICAgICAgICAgICBsZW4ob2xkX2RlZikgPiAxIG9yIGxlbihuZXdfZGVmKSA+ IDEKLSAgICAgICAgICAgICAgICApIGFuZCgKKyAgICAgICAgICAgICAgICApIGFuZCAoCiAgICAg ICAgICAgICAgICAgICAgICAgICBvbGRfZGVmWzBdICE9IG5ld19kZWZbMF0gYW5kCiAgICAgICAg ICAgICAgICAgICAgICAgICBvbGRfZGVmWzBdIG5vdCBpbiBuZXdfZGVmWzBdCiAgICAgICAgICAg ICAgICAgKToKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9z ZXJ2ZXJzL3BnYWdlbnQvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc2VydmVycy9wZ2FnZW50L19faW5pdF9fLnB5CmluZGV4IDI4YThlNTkwMS4uY2I4NTJm ODRjIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9wZ2FnZW50L19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL3BnYWdlbnQvX19pbml0X18ucHkKQEAgLTI4NCw3ICsyODQsOCBAQCBTRUxF Q1QgRVhJU1RTKAogICAgICAgICAgICAgICAgICAgICBzdGF0dXM9NDEwLAogICAgICAgICAgICAg ICAgICAgICBzdWNjZXNzPTAsCiAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPV8oCi0gICAg ICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRl ciAoJXMpLiIpICUgYXJnCisgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQg dGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoe30pLiIuCisgICAgICAgICAgICAgICAgICAgICAgICBm b3JtYXQoYXJnKSkKICAgICAgICAgICAgICAgICApCiAKICAgICAgICAgc3RhdHVzLCByZXMgPSBz ZWxmLmNvbm4uZXhlY3V0ZV92b2lkKCdCRUdJTicpCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9yZXNvdXJjZV9ncm91cHMvX19pbml0X18ucHkg Yi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9yZXNvdXJjZV9ncm91 cHMvX19pbml0X18ucHkKaW5kZXggMjRkMzIwNmFkLi5jNjhhMDliOWEgMTAwNjQ0Ci0tLSBhL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3Jlc291cmNlX2dyb3Vwcy9f X2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9yZXNvdXJjZV9ncm91cHMvX19pbml0X18ucHkKQEAgLTM2Myw3ICszNjMsOCBAQCBjbGFzcyBS ZXNvdXJjZUdyb3VwVmlldyhOb2RlVmlldyk6CiAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00 MTAsCiAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAg ZXJyb3Jtc2c9Z2V0dGV4dCgKLSAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmlu ZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIikgJSBhcmcKKyAgICAgICAgICAgICAgICAg ICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICh7fSkuIi4KKyAg ICAgICAgICAgICAgICAgICAgICAgIGZvcm1hdChhcmcpKQogICAgICAgICAgICAgICAgICkKICAg ICAgICAgdHJ5OgogICAgICAgICAgICAgIyBCZWxvdyBsb2dpYyB3aWxsIGNyZWF0ZSBuZXcgcmVz b3VyY2UgZ3JvdXAKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL3RhYmxlc3BhY2VzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvdGFibGVzcGFjZXMvX19pbml0X18ucHkKaW5kZXggNzNlODFl MWIxLi4wNDk1NGI4MGIgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL3RhYmxlc3BhY2VzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jy b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3RhYmxlc3BhY2VzL19faW5pdF9fLnB5CkBAIC0y OTUsOCArMjk1LDggQEAgY2xhc3MgVGFibGVzcGFjZVZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAg ICAgICAgICAgICAgICAgICAgc3RhdHVzPTQxMCwKICAgICAgICAgICAgICAgICAgICAgc3VjY2Vz cz0wLAogICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0KAotICAgICAgICAgICAg ICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4i KSAlCi0gICAgICAgICAgICAgICAgICAgIHJlcXVpcmVkX2FyZ3NbYXJnXQorICAgICAgICAgICAg ICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKHt9KS4i LgorICAgICAgICAgICAgICAgICAgICAgICAgZm9ybWF0KHJlcXVpcmVkX2FyZ3NbYXJnXSkpCiAg ICAgICAgICAgICAgICAgKQogCiAgICAgICAgICMgVG8gZm9ybWF0IHByaXZpbGVnZXMgY29taW5n IGZyb20gY2xpZW50Cg== --00000000000049915a05a34e2611--