Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1iU69B-00058v-RI for pgadmin-hackers@arkaria.postgresql.org; Mon, 11 Nov 2019 09:38:10 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1iU69A-0005Yj-6B for pgadmin-hackers@arkaria.postgresql.org; Mon, 11 Nov 2019 09:38:08 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1iU699-0005Tl-RU for pgadmin-hackers@lists.postgresql.org; Mon, 11 Nov 2019 09:38:07 +0000 Received: from mail-oi1-x242.google.com ([2607:f8b0:4864:20::242]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1iU695-0002Do-Pa for pgadmin-hackers@postgresql.org; Mon, 11 Nov 2019 09:38:07 +0000 Received: by mail-oi1-x242.google.com with SMTP id e9so10920884oif.8 for ; Mon, 11 Nov 2019 01:38:03 -0800 (PST) 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=70jEHNKE5AaMGVoV9FGjZhyeKcTAKAxZYyw8yYcQGVM=; b=hcjWhqzE6ZLhQEq9Fk3FT6oCJL+kHKg2WoNReY6V6d3xxaWhb97U+w18yBzcZIlevj 5kmU/6zV7uFwdvc3nOX5oBBPAQ0BNIZZCoJ5bHDgEzSX+DPMLkBG7qxK2gyFenk9v2Ea 3m5xt64ItwgHb9yTgr5GPUBMKWxICFo0jxDv/IaAxAMYuXt3zxGwHbCzhGiA2fJh2EuY 5laCCDCcyMNuhLF8wM68/CADHrgp7iar6KO3osIavvjhE8nlWiJPRvzpiLyVkiGrUYHS cmm1Mj23lyeSwodALaQbVweff2CD8ntC0ksFJBTzl2skPhUtGJoggv0guTwnvq0LdyzR f+xA== 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=70jEHNKE5AaMGVoV9FGjZhyeKcTAKAxZYyw8yYcQGVM=; b=e3qf9LXFukwRIB0Lad9j2yFbW54QTgYMUIjzwYa/+88dgrUiOjrszxySmW8NqRvQk2 eVFjPDadVbd4ju4/yHCWITfz8Jg+fk4MTjvTxR+0l3wxnT6Bh1IRTwtXd4S/4UuspuN7 SuUe3c1GUvPbod14JXfLQpMgbT/gT7pdwg9zV8gPJcDb9pQ7DH86ObYv9N5Zc7nHvWlr 7dXIJn/TjJOntJjM8bV1tYiWMl49ZSAFp1rPpi6YQBEi7pmXoaDST7J+x3LfDoPJeeMv 6ji7OTFD277DVpZ1xM9ITaczVzGHVR81T9KE9b66QnhrLCFGcuhhfpFTCqD2sr1t2o1N mg6Q== X-Gm-Message-State: APjAAAVa+DaljxrcYa829/HcaAkz7Yt78fBfVyRA+4zo9+oae0GhouLv z62IU717AhixnD8wUDEssJgLAbEI+u2nxgmlk88yTeRXwR2O1XYcxJDU695pDzwW8Q2SISVefVT BJNPtyMBGJU/9sIXCJ5yZH6hXw+I2BoSUWIrJ29XZ87c5grt60sQwpX1m9ILdd1Sd87UI7njDyk rTZJ6SN2acEOT2T/l6bAk/tw2L8pDPWkPr9YrjDgx4dwBKxGgb2i74JAJCrDA= X-Google-Smtp-Source: APXvYqzq9h4IbRHLWCQ+jsiw66XYlkEajFNfSKeLH/hdtDK+ke3X3tLqzO6+yJHp7SHYCxvUn4R5sQlyLYUfAo+a2yU= X-Received: by 2002:aca:4dcc:: with SMTP id a195mr22894546oib.172.1573465081231; Mon, 11 Nov 2019 01:38:01 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Aditya Toshniwal Date: Mon, 11 Nov 2019 15:07:25 +0530 Message-ID: Subject: Re: [pgAdmin][RM4348] Theme options in pgAdmin and dark theme To: pgadmin-hackers , Ashesh Vashi Cc: Akshay Joshi , Dave Page Content-Type: multipart/mixed; boundary="0000000000003c00a205970ee3e9" 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 --0000000000003c00a205970ee3e9 Content-Type: multipart/alternative; boundary="0000000000003c009c05970ee3e7" --0000000000003c009c05970ee3e7 Content-Type: text/plain; charset="UTF-8" Hi Hackers, Attached is the patch for further improvements in the Dark theme colors. Gray shades and other colors are changed to identify different components more clearly. Few of the controls were missing the privileges of dark theme, fixed that. Few dashboard graph related changes. As suggested, theme related code changes is removed from config.py and moved to miscellaneous under a new package - Themes. Thank you @Ashesh Vashi for inputs on that. Kindly review. On Mon, Nov 11, 2019 at 3:00 PM Aditya Toshniwal < aditya.toshniwal@enterprisedb.com> wrote: > Hi Dave, > > On Mon, Nov 11, 2019 at 2:38 PM Dave Page wrote: > >> Hi >> >> On Mon, Nov 11, 2019 at 7:01 AM Aditya Toshniwal < >> aditya.toshniwal@enterprisedb.com> wrote: >> >>> Hi Dave, >>> >>> On Thu, Nov 7, 2019 at 7:56 PM Dave Page wrote: >>> >>>> >>>> >>>> On Thu, Nov 7, 2019 at 2:18 PM Dave Page wrote: >>>> >>>>> >>>>> On Thu, Nov 7, 2019 at 1:25 PM Akshay Joshi < >>>>> akshay.joshi@enterprisedb.com> wrote: >>>>> >>>>>> Thanks, patch applied. >>>>>> >>>>>> On Thu, Nov 7, 2019 at 6:39 PM Aditya Toshniwal < >>>>>> aditya.toshniwal@enterprisedb.com> wrote: >>>>>> >>>>>>> Hi Hackers, >>>>>>> >>>>>>> Attached is the updated patch with few more changes and corrections. >>>>>>> Kindly review. >>>>>>> >>>>>> >>>>> I've committed a couple of minor tweaks - one to remove a space, e.g. >>>>> >>>>> gettext('A page refresh is required to apply the theme. Do you wish to refresh the page now ?'), >>>>> >>>>> is now: >>>>> >>>>> gettext('A page refresh is required to apply the theme. Do you wish to refresh the page now?'), >>>>> >>>>> And another change to fix the word wrapping in the README which was >>>>> totally different from the rest of the file. >>>>> >>>>> Thanks! >>>>> >>>> >>>> Oh, and do we need all the code in config.py? I really didn't even want >>>> a config option in there to turn theming on or off (what's the point?), let >>>> alone 20 new lines. >>>> >>> The code is added after the config_local and config_distro is loaded. >>> So, user won't be able to disable it unless he directly changes the >>> config.py. >>> >> >> That is clearly wrong and needs to be fixed. config_local and >> config_distro should be able to override anything in config.py. >> >> But... why allow the themes to be updated or disabled at all? It's not >> like a non-developer can add new ones, and it's not a security issue that >> an administrator might need to control. In fact, it's arguably an >> accessibility feature, for those whose eyes (like mine) last the day better >> with a darker theme. >> >> Let's remove it entirely please. I don't see any good reason to have any >> of that in config.py. >> > Intention is not to allow disabling the themes, but it's the feature > implementation code. I'll move out the code. > >> >> Thanks. >> >> >>> I'll reduce the code a bit. >>> >>>> >>>> -- >>>> Dave Page >>>> Blog: http://pgsnake.blogspot.com >>>> Twitter: @pgsnake >>>> >>>> EnterpriseDB UK: http://www.enterprisedb.com >>>> The Enterprise PostgreSQL Company >>>> >>> >>> >>> -- >>> Thanks and Regards, >>> Aditya Toshniwal >>> Sr. Software Engineer | EnterpriseDB India | Pune >>> "Don't Complain about Heat, Plant a TREE" >>> >> >> >> -- >> Dave Page >> Blog: http://pgsnake.blogspot.com >> Twitter: @pgsnake >> >> EnterpriseDB UK: http://www.enterprisedb.com >> The Enterprise PostgreSQL Company >> > > > -- > Thanks and Regards, > Aditya Toshniwal > Sr. Software Engineer | EnterpriseDB India | Pune > "Don't Complain about Heat, Plant a TREE" > -- Thanks and Regards, Aditya Toshniwal Sr. Software Engineer | EnterpriseDB India | Pune "Don't Complain about Heat, Plant a TREE" --0000000000003c009c05970ee3e7 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Hackers,

Attached is the patch for further=C2=A0improve= ments in the Dark theme colors.
Gray shades and other colors are changed to= identify different components more clearly. Few of the controls were missi= ng the privileges of dark theme, fixed that.
Few dashboard=C2=A0graph=C2=A0= related changes.
As suggested, theme related code changes is removed from c= onfig.py and moved to miscellaneous under a new package - Themes. Thank you= =C2=A0@Ashesh Vashi=C2=A0for inp= uts on that.

Kindly review.

=
On Mon, Nov 11, 2019 at 3:00 PM Adity= a Toshniwal <aditya= .toshniwal@enterprisedb.com> wrote:
Hi Dave,

On Mo= n, Nov 11, 2019 at 2:38 PM Dave Page <dpage@pgadmin.org> wrote:
Hi

On Mon, Nov 1= 1, 2019 at 7:01 AM Aditya Toshniwal <aditya.toshniwal@enterprisedb.com&g= t; wrote:
H= i Dave,

On Thu, Nov 7, 2019 at 7:56 PM Dave Page <dpage@pgadmin.org> wrote:
<= /div>


On Thu, Nov 7, 2019 at 2:18 PM Dave Page <dpage@pgadmin.org> wrote:=

On Thu, Nov 7, 2019 at 1:25 PM Akshay Joshi <akshay.joshi@en= terprisedb.com> wrote:
Thanks, patch applied.

On Thu, Nov 7, 2019 = at 6:39 PM Aditya Toshniwal <aditya.toshniwal@enterprisedb.com> wrote= :
Hi Hackers,

Attached is the updated patch with few more changes and c= orrections.
Kindly revie= w.

I've = committed a couple of minor tweaks - one to remove a space, e.g.
= 
gettext(&#=
39;A page refresh is required to apply the theme. Do you wish to refresh th=
e page now ?'),
is now:
gettext('A page refr=
esh is required to apply the theme. Do you wish to refresh the page now?=
9;),
And another change to fix the word wrapping in = the README which was totally different from the rest of the file.

Thanks!

O= h, and do we need all the code in config.py? I really didn't even want = a config option in there to turn theming on or off (what's the point?),= let alone 20 new lines.
The code is added a= fter the config_local and config_distro is loaded. So, user won't be ab= le to disable it unless he directly changes the config.py.

That is clearly wrong and needs t= o be fixed. config_local and config_distro should be able to override anyth= ing in config.py.

But... why allow the themes to b= e updated or disabled at all? It's not like a non-developer can add new= ones, and it's not a security issue that an administrator might need t= o control. In fact, it's arguably an accessibility feature, for those w= hose eyes (like mine) last the day better with a darker theme.
Let's remove it entirely please. I don't see any good = reason to have any of that in config.py.
Int= ention is not to allow disabling the themes, but it's the feature imple= mentation code.=C2=A0I'll move out the code.

Thanks.
=C2=A0
I'll reduce the code a bit.

--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

Enterprise= DB UK: http://www= .enterprisedb.com
The Enterprise PostgreSQL Company


--
Th= anks and Regards,
Aditya = Toshniwal
Sr. Software Engineer |=C2=A0EnterpriseDB India |=C2=A0Pune
"Don't Complain a= bout Heat, Plant a TREE"


--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB= UK: http://www.e= nterprisedb.com
The Enterprise PostgreSQL Company


--
Th= anks and Regards,
Aditya = Toshniwal
Sr. Software Engineer |=C2=A0EnterpriseDB India |=C2=A0Pune
"Don't Complain a= bout Heat, Plant a TREE"


--
Thanks and Regards,
Aditya Toshniwal
Sr. Software Engineer |=C2=A0EnterpriseDB In= dia |=C2=A0Pune
"Don't Complain about Heat, Plant a TREE"
=
--0000000000003c009c05970ee3e7-- --0000000000003c00a205970ee3e9 Content-Type: application/octet-stream; name="RM4348.part2.patch" Content-Disposition: attachment; filename="RM4348.part2.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k2u8gcl50 ZGlmZiAtLWdpdCBhL3dlYi9jb25maWcucHkgYi93ZWIvY29uZmlnLnB5CmluZGV4IGY5OTJjYzQ4 Ny4uZDc4MDJkNjk1IDEwMDY0NAotLS0gYS93ZWIvY29uZmlnLnB5CisrKyBiL3dlYi9jb25maWcu cHkKQEAgLTQ4NywyNSArNDg3LDYgQEAgdHJ5OgogZXhjZXB0IEltcG9ydEVycm9yOgogICAgIHBh c3MKIAotVEhFTUVTID0gewotICAgICJzdGFuZGFyZCI6IHsKLSAgICAgICAgImRpc3BfbmFtZSI6 ICJTdGFuZGFyZCIsCi0gICAgICAgICJjc3NmaWxlIjogInBnYWRtaW4iLAotICAgICAgICAicHJl dmlld19pbWciOiAic3RhbmRhcmRfcHJldmlldy5wbmciCi0gICAgfQotfQotCi1PVEhFUl9USEVN RVMgPSB7fQotdHJ5OgotICAgIGV4dHJhX3RoZW1lcyA9IGpzb24ubG9hZChvcGVuKCdwZ2FkbWlu LnRoZW1lcy5qc29uJykpCi0gICAgT1RIRVJfVEhFTUVTLnVwZGF0ZShleHRyYV90aGVtZXMpCi1l eGNlcHQgRXhjZXB0aW9uOgotICAgIHBhc3MKLQotIyBTZXQgT1RIRVJfVEhFTUVTIHRvIE5vbmUg aGVyZSB0byBkaXNhYmxlIGFsbCBvdGhlciB0aGVtZXMKLQotaWYgT1RIRVJfVEhFTUVTIGlzIG5v dCBOb25lOgotICAgIFRIRU1FUy51cGRhdGUoT1RIRVJfVEhFTUVTKQogCiAjIFNVUFBPUlRfU1NI X1RVTk5FTCBjYW4gYmUgb3ZlcnJpZGUgaW4gbG9jYWwgY29uZmlnIGZpbGUgYW5kIGlmIHRoYXQK ICMgc2V0dGluZyBpcyBGYWxzZSBpbiBsb2NhbCBjb25maWcgdGhlbiB3ZSBzaG91bGQgbm90IGNo ZWNrIHRoZSBQeXRob24gdmVyc2lvbi4KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL19faW5pdF9f LnB5IGIvd2ViL3BnYWRtaW4vX19pbml0X18ucHkKaW5kZXggNDFjYTA1MWYxLi44YTM4YzBhZDAg MTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL19f aW5pdF9fLnB5CkBAIC03MTEsMjggKzcxMSwxOCBAQCBkZWYgY3JlYXRlX2FwcChhcHBfbmFtZT1O b25lKToKICAgICAgICAgZnJvbSBmbGFza19jb21wcmVzcyBpbXBvcnQgQ29tcHJlc3MKICAgICAg ICAgQ29tcHJlc3MoYXBwKQogCisgICAgZnJvbSBwZ2FkbWluLm1pc2MudGhlbWVzIGltcG9ydCBU aGVtZXMKKyAgICBUaGVtZXMoYXBwKQorCiAgICAgQGFwcC5jb250ZXh0X3Byb2Nlc3NvcgogICAg IGRlZiBpbmplY3RfYmx1ZXByaW50KCk6CiAgICAgICAgICIiIgogICAgICAgICBJbmplY3QgYSBy ZWZlcmVuY2UgdG8gdGhlIGN1cnJlbnQgYmx1ZXByaW50LCBpZiBhbnkuCi0gICAgICAgIEFsc28g dGhlIGdldF90aGVtZV9jc3MgZnVuYy4KICAgICAgICAgIiIiCiAKLSAgICAgICAgZGVmIGdldF90 aGVtZV9jc3MoKToKLSAgICAgICAgICAgIG1pc2NfcHJlZmVyZW5jZSA9IFByZWZlcmVuY2VzLm1v ZHVsZSgnbWlzYycpCi0gICAgICAgICAgICB0aGVtZSA9IG1pc2NfcHJlZmVyZW5jZS5wcmVmZXJl bmNlKCd0aGVtZScpLmdldCgpCi0gICAgICAgICAgICB0aGVtZV9jc3MgPSBjb25maWcuVEhFTUVT WydzdGFuZGFyZCddWydjc3NmaWxlJ10gKyAnLmNzcycKLQotICAgICAgICAgICAgaWYgdGhlbWUg bm90IGluIGNvbmZpZy5USEVNRVM6Ci0gICAgICAgICAgICAgICAgcGFzcwotICAgICAgICAgICAg ZWxzZToKLSAgICAgICAgICAgICAgICB0aGVtZV9jc3MgPSBjb25maWcuVEhFTUVTW3RoZW1lXVsn Y3NzZmlsZSddICsgJy5jc3MnCi0gICAgICAgICAgICByZXR1cm4gdGhlbWVfY3NzCi0KICAgICAg ICAgcmV0dXJuIHsKICAgICAgICAgICAgICdjdXJyZW50X2FwcCc6IGN1cnJlbnRfYXBwLAogICAg ICAgICAgICAgJ2N1cnJlbnRfYmx1ZXByaW50JzogY3VycmVudF9ibHVlcHJpbnQsCi0gICAgICAg ICAgICAnZ2V0X3RoZW1lX2Nzcyc6IGdldF90aGVtZV9jc3MsCiAgICAgICAgIH0KIAogICAgIEBh cHAuZXJyb3JoYW5kbGVyKEV4Y2VwdGlvbikKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Rhc2hi b2FyZC9zdGF0aWMvanMvY2hhcnRpbmcuanMgYi93ZWIvcGdhZG1pbi9kYXNoYm9hcmQvc3RhdGlj L2pzL2NoYXJ0aW5nLmpzCmluZGV4IDNiOWE0YzI0YS4uNmIxMzk1NTA3IDEwMDY0NAotLS0gYS93 ZWIvcGdhZG1pbi9kYXNoYm9hcmQvc3RhdGljL2pzL2NoYXJ0aW5nLmpzCisrKyBiL3dlYi9wZ2Fk bWluL2Rhc2hib2FyZC9zdGF0aWMvanMvY2hhcnRpbmcuanMKQEAgLTMyLDYgKzMyLDEwIEBAIGV4 cG9ydCBjbGFzcyBDaGFydCB7CiAgICAgICB9LAogICAgICAgc2hhZG93U2l6ZTogMCwKICAgICAg IHJlc29sdXRpb24gOiAzLAorICAgICAgZ3JpZDogeworICAgICAgICBjb2xvcjogJ3RyYW5zcGFy ZW50JywKKyAgICAgICAgdGlja0NvbG9yOiAnIzhmOGY4ZicsCisgICAgICB9LAogICAgIH07CiAK ICAgICB0aGlzLl9kYXRhc2V0ID0gbnVsbDsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Rhc2hi b2FyZC9zdGF0aWMvc2Nzcy9fZGFzaGJvYXJkLnNjc3MgYi93ZWIvcGdhZG1pbi9kYXNoYm9hcmQv c3RhdGljL3Njc3MvX2Rhc2hib2FyZC5zY3NzCmluZGV4IDRiMjA0YTNiYi4uYmE1MTY1MGI4IDEw MDY0NAotLS0gYS93ZWIvcGdhZG1pbi9kYXNoYm9hcmQvc3RhdGljL3Njc3MvX2Rhc2hib2FyZC5z Y3NzCisrKyBiL3dlYi9wZ2FkbWluL2Rhc2hib2FyZC9zdGF0aWMvc2Nzcy9fZGFzaGJvYXJkLnNj c3MKQEAgLTQzLDEwICs0MywyMyBAQAogICAgICYgLmZsb3RyLWxhYmVscyB7CiAgICAgICAgIGNv bG9yOiAkY29sb3ItZmcgIWltcG9ydGFudDsKICAgICB9Ci0gICAmIC5mbG90ci1sZWdlbmQgewot ICAgICAgICAuZmxvdHItbGVnZW5kLWxhYmVsIHsKKyAgICAmIC5mbG90ci1sZWdlbmQgeworICAg ICAgICBib3JkZXI6IG5vbmUgIWltcG9ydGFudDsKKyAgICAgICAgcGFkZGluZzogMC4yNXJlbSAw LjVyZW07CisgICAgICAgICYgLmZsb3RyLWxlZ2VuZC1sYWJlbCB7CiAgICAgICAgICAgICBjb2xv cjogJGNvbG9yLWZnICFpbXBvcnRhbnQ7CiAgICAgICAgICAgICBwYWRkaW5nLWxlZnQ6IDAuMjVy ZW07CiAgICAgICAgIH0KLSAgIH0KKworICAgICAgICAmIC5mbG90ci1sZWdlbmQtY29sb3ItYm94 PmRpdiB7CisgICAgICAgICAgICBib3JkZXI6IG5vbmUgIWltcG9ydGFudDsKKyAgICAgICAgICAg ICY+ZGl2IHsKKyAgICAgICAgICAgICAgICBib3JkZXI6IG5vbmUgIWltcG9ydGFudDsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAgICYgLmZsb3RyLWxlZ2VuZC1iZyB7CisgICAg ICAgICAgICBib3JkZXItcmFkaXVzOiAkYm9yZGVyLXJhZGl1czsKKyAgICAgICAgfQorICAgIH0K IH0KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvX19pbml0X18ucHkgYi93ZWIvcGdhZG1p bi9taXNjL19faW5pdF9fLnB5CmluZGV4IDY4ZDQzODFhZi4uZDBiZWY4ZTE1IDEwMDY0NAotLS0g YS93ZWIvcGdhZG1pbi9taXNjL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL21pc2MvX19p bml0X18ucHkKQEAgLTE0LDkgKzE0LDggQEAgZnJvbSBmbGFzayBpbXBvcnQgdXJsX2ZvciwgcmVu ZGVyX3RlbXBsYXRlLCBSZXNwb25zZSwgcmVxdWVzdAogZnJvbSBmbGFza19iYWJlbGV4IGltcG9y dCBnZXR0ZXh0CiBmcm9tIHBnYWRtaW4udXRpbHMgaW1wb3J0IFBnQWRtaW5Nb2R1bGUKIGZyb20g cGdhZG1pbi51dGlscy5jc3JmIGltcG9ydCBwZ0NTUkZQcm90ZWN0Ci1mcm9tIHBnYWRtaW4udXRp bHMucHJlZmVyZW5jZXMgaW1wb3J0IFByZWZlcmVuY2VzCiBmcm9tIHBnYWRtaW4udXRpbHMuc2Vz c2lvbiBpbXBvcnQgY2xlYW51cF9zZXNzaW9uX2ZpbGVzCi0KK2Zyb20gcGdhZG1pbi5taXNjLnRo ZW1lcyBpbXBvcnQgZ2V0X2FsbF90aGVtZXMKIGltcG9ydCBjb25maWcKIAogTU9EVUxFX05BTUUg PSAnbWlzYycKQEAgLTY4LDE2ICs2NywxNiBAQCBjbGFzcyBNaXNjTW9kdWxlKFBnQWRtaW5Nb2R1 bGUpOgogCiAgICAgICAgIHRoZW1lX29wdGlvbnMgPSBbXQogCi0gICAgICAgIGZvciB0aGVtZSBp biBjb25maWcuVEhFTUVTOgorICAgICAgICBmb3IgdGhlbWUsIHRoZW1lX2RhdGEgaW4gKGdldF9h bGxfdGhlbWVzKCkpLml0ZW1zKCk6CiAgICAgICAgICAgICB0aGVtZV9vcHRpb25zLmFwcGVuZCh7 Ci0gICAgICAgICAgICAgICAgJ2xhYmVsJzogY29uZmlnLlRIRU1FU1t0aGVtZV1bJ2Rpc3BfbmFt ZSddCisgICAgICAgICAgICAgICAgJ2xhYmVsJzogdGhlbWVfZGF0YVsnZGlzcF9uYW1lJ10KICAg ICAgICAgICAgICAgICAucmVwbGFjZSgnXycsICcgJykKICAgICAgICAgICAgICAgICAucmVwbGFj ZSgnLScsICcgJykKICAgICAgICAgICAgICAgICAudGl0bGUoKSwKICAgICAgICAgICAgICAgICAn dmFsdWUnOiB0aGVtZSwKICAgICAgICAgICAgICAgICAncHJldmlld19zcmMnOiB1cmxfZm9yKAog ICAgICAgICAgICAgICAgICAgICAnc3RhdGljJywgZmlsZW5hbWU9J2pzL2dlbmVyYXRlZC9pbWcv JyArCi0gICAgICAgICAgICAgICAgICAgIGNvbmZpZy5USEVNRVNbdGhlbWVdWydwcmV2aWV3X2lt ZyddCisgICAgICAgICAgICAgICAgICAgIHRoZW1lX2RhdGFbJ3ByZXZpZXdfaW1nJ10KICAgICAg ICAgICAgICAgICApCiAgICAgICAgICAgICB9KQogCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9t aXNjL3RoZW1lcy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL21pc2MvdGhlbWVzL19faW5pdF9f LnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMC4uYTZhZjVkNTBmCi0tLSAv ZGV2L251bGwKKysrIGIvd2ViL3BnYWRtaW4vbWlzYy90aGVtZXMvX19pbml0X18ucHkKQEAgLTAs MCArMSwzOSBAQAoraW1wb3J0IGpzb24KK2Zyb20gcGdhZG1pbi51dGlscy5wcmVmZXJlbmNlcyBp bXBvcnQgUHJlZmVyZW5jZXMKKworCitkZWYgZ2V0X2FsbF90aGVtZXMoKToKKyAgICBhbGxfdGhl bWVzID0geworICAgICAgICAic3RhbmRhcmQiOiB7CisgICAgICAgICAgICAiZGlzcF9uYW1lIjog IlN0YW5kYXJkIiwKKyAgICAgICAgICAgICJjc3NmaWxlIjogInBnYWRtaW4iLAorICAgICAgICAg ICAgInByZXZpZXdfaW1nIjogInN0YW5kYXJkX3ByZXZpZXcucG5nIgorICAgICAgICB9CisgICAg fQorCisgICAgdHJ5OgorICAgICAgICBhbGxfdGhlbWVzLnVwZGF0ZShqc29uLmxvYWQob3Blbign cGdhZG1pbi50aGVtZXMuanNvbicpKSkKKyAgICBleGNlcHQgRXhjZXB0aW9uIGFzIF86CisgICAg ICAgIHBhc3MKKworICAgIHJldHVybiBhbGxfdGhlbWVzCisKKworZGVmIFRoZW1lcyhhcHApOgor ICAgIEBhcHAuY29udGV4dF9wcm9jZXNzb3IKKyAgICBkZWYgaW5qZWN0X3RoZW1lX2Z1bmMoKToK KyAgICAgICAgZGVmIGdldF90aGVtZV9jc3MoKToKKyAgICAgICAgICAgIGFsbF90aGVtZXMgPSBn ZXRfYWxsX3RoZW1lcygpCisgICAgICAgICAgICBtaXNjX3ByZWZlcmVuY2UgPSBQcmVmZXJlbmNl cy5tb2R1bGUoJ21pc2MnKQorICAgICAgICAgICAgdGhlbWUgPSBtaXNjX3ByZWZlcmVuY2UucHJl ZmVyZW5jZSgndGhlbWUnKS5nZXQoKQorICAgICAgICAgICAgdGhlbWVfY3NzID0gYWxsX3RoZW1l c1snc3RhbmRhcmQnXVsnY3NzZmlsZSddICsgJy5jc3MnCisKKyAgICAgICAgICAgIGlmIHRoZW1l IG5vdCBpbiBhbGxfdGhlbWVzOgorICAgICAgICAgICAgICAgIHBhc3MKKyAgICAgICAgICAgIGVs c2U6CisgICAgICAgICAgICAgICAgdGhlbWVfY3NzID0gYWxsX3RoZW1lc1t0aGVtZV1bJ2Nzc2Zp bGUnXSArICcuY3NzJworICAgICAgICAgICAgcmV0dXJuIHRoZW1lX2NzcworCisgICAgICAgIHJl dHVybiB7CisgICAgICAgICAgICAnZ2V0X3RoZW1lX2Nzcyc6IGdldF90aGVtZV9jc3MsCisgICAg ICAgIH0KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9iYWNrZm9ybS5wZ2FkbWlu LmpzIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2JhY2tmb3JtLnBnYWRtaW4uanMKaW5kZXggNGQ5 YWE5MTU1Li43N2M1ZDE0NDkgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9iYWNr Zm9ybS5wZ2FkbWluLmpzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9iYWNrZm9ybS5wZ2Fk bWluLmpzCkBAIC0yMDY3LDcgKzIwNjcsNyBAQCBkZWZpbmUoWwogICAgICAgfQogCiAgICAgICBs ZXQgbmV3X3ZhbHVlID0gXy5maW5kV2hlcmUodGhpcy5maWVsZC5nZXQoJ29wdGlvbnMnKSwge3Zh bHVlOiBldnQucGFyYW1zLmRhdGEuaWR9KTsKLSAgICAgIGlmKG5ld192YWx1ZS5wcmV2aWV3X3Ny YykgeworICAgICAgaWYoIV8uaXNVbmRlZmluZWQobmV3X3ZhbHVlLnByZXZpZXdfc3JjKSAmJiBu ZXdfdmFsdWUucHJldmlld19zcmMpIHsKICAgICAgICAgdGhpcy4kZWwuZmluZCgnLnByZXZpZXct aW1nIGltZycpLmF0dHIoJ3NyYycsIG5ld192YWx1ZS5wcmV2aWV3X3NyYyk7CiAgICAgICB9CiAg ICAgfSwKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL19iYWNrZ3JpZC5vdmVy cmlkZXMuc2NzcyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL19iYWNrZ3JpZC5vdmVycmlkZXMu c2NzcwppbmRleCBjOTI5ZGRkNDUuLmVhYzI1MDI1NiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4v c3RhdGljL3Njc3MvX2JhY2tncmlkLm92ZXJyaWRlcy5zY3NzCisrKyBiL3dlYi9wZ2FkbWluL3N0 YXRpYy9zY3NzL19iYWNrZ3JpZC5vdmVycmlkZXMuc2NzcwpAQCAtMTAsNiArMTAsMTQgQEAKICAg Y3Vyc29yOiBwb2ludGVyOwogfQogCisuYmFja2dyaWQgLmFzY2VuZGluZyAuc29ydC1jYXJldCB7 CisgICAgYm9yZGVyLWJvdHRvbS1jb2xvcjogJGNvbG9yLWZnOworfQorCisuYmFja2dyaWQgLmRl c2NlbmRpbmcgLnNvcnQtY2FyZXQgeworICAgIGJvcmRlci10b3AtY29sb3I6ICRjb2xvci1mZzsK K30KKwogLmJhY2tncmlkLmJhY2tncmlkLXN0cmlwZWQgdGJvZHkgewogICAmIHRyOm50aC1jaGls ZChldmVuKSB7CiAgICAgYmFja2dyb3VuZDogJHRhYmxlLWJnOwpAQCAtODAsOCArODgsOCBAQAog CiAuYmFja2dyaWQgdGhlYWQgdGQsCiAuYmFja2dyaWQgdGhlYWQgdGh7Ci0gIGJhY2tncm91bmQ6 ICRjb2xvci1iZzsKLSAgYmFja2dyb3VuZC1jb2xvcjogJGNvbG9yLWJnICFpbXBvcnRhbnQ7Cisg IGJhY2tncm91bmQ6ICR0YWJsZS1iZzsKKyAgYmFja2dyb3VuZC1jb2xvcjogJHRhYmxlLWJnICFp bXBvcnRhbnQ7CiAgIHRleHQtYWxpZ246IGxlZnQ7CiB9CiAKQEAgLTIwMyw3ICsyMTEsNyBAQCBz cGFuLmZvcm0tY29udHJvbDpkaXNhYmxlZCB7CiB9CiAKIC5zdWJub2RlLWhlYWRlciB7Ci0gICAg YmFja2dyb3VuZC1jb2xvcjogJGNvbG9yLWJnOworICAgIGJhY2tncm91bmQtY29sb3I6ICRoZWFk ZXItYmc7CiAgICAgY29sb3I6ICRjb2xvci1mZzsKICAgICBib3JkZXItYm90dG9tOiAkcGFuZWwt Ym9yZGVyOwogfQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX3BnYWRtaW4u c3R5bGUuc2NzcyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL19wZ2FkbWluLnN0eWxlLnNjc3MK aW5kZXggNTNhZWRkZjhiLi44OTFiYjlhMGQgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRp Yy9zY3NzL19wZ2FkbWluLnN0eWxlLnNjc3MKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3Mv X3BnYWRtaW4uc3R5bGUuc2NzcwpAQCAtMTg2LDcgKzE4Niw3IEBACiAgICAgJi5wZy1wcm9wLWJ0 bi1ncm91cC1iZWxvdyB7CiAgICAgICB0ZXh0LWFsaWduOiByaWdodDsKICAgICAgIHBhZGRpbmc6 ICRmb290ZXItcGFkZGluZzsKLSAgICAgIGJhY2tncm91bmQ6ICRjb2xvci1iZzsKKyAgICAgIGJh Y2tncm91bmQ6ICRoZWFkZXItYmc7CiAgICAgICBib3JkZXItdG9wOiAkcGFuZWwtYm9yZGVyOwog ICAgIH0KICAgfQpAQCAtMzUzLDcgKzM1Myw3IEBACiAgIGRpc3BsYXk6IGJsb2NrOwogICB0ZXh0 LWFsaWduOiBsZWZ0OwogICBjdXJzb3I6IHBvaW50ZXI7Ci0gIGJhY2tncm91bmQtY29sb3I6ICRj b2xvci1iZzsKKyAgYmFja2dyb3VuZC1jb2xvcjogJGhlYWRlci1iZzsKICAgcGFkZGluZzogN3B4 OwogICBmb250LXNpemU6IGluaGVyaXQ7CiAgIGJvcmRlci1ib3R0b206ICRwYW5lbC1ib3JkZXI7 CkBAIC04NDIsNyArODQyLDcgQEAgYm9keSB7CiB9CiAKIC5uYXYtdGFicyB7Ci0gIGJhY2tncm91 bmQtY29sb3I6ICRjb2xvci1iZzsKKyAgYmFja2dyb3VuZC1jb2xvcjogJGhlYWRlci1iZzsKIH0K IAogLmVkaXRvci10b29sYmFyIHsKQEAgLTEwMzQsMyArMTAzNCwyOCBAQCB0ZXh0YXJlYSB7CiAg ICAgY29sb3I6ICRpbnB1dC1jb2xvcjsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAkaW5wdXQtYmc7 CiB9CisKKworLyogQ3VzdG9tIHNjcm9sbGJhciAqLworLyogd2lkdGggKi8KKzo6LXdlYmtpdC1z Y3JvbGxiYXIgeworICB3aWR0aDogMC41cmVtOworICBoZWlnaHQ6IDAuNXJlbTsKK30KKworLyog VHJhY2sgKi8KKzo6LXdlYmtpdC1zY3JvbGxiYXItdHJhY2ssIDo6LXdlYmtpdC1zY3JvbGxiYXIt Y29ybmVyIHsKKyAgYmFja2dyb3VuZDogdHJhbnNwYXJlbnQ7CisgIGJhY2tncm91bmQtY29sb3I6 IHRyYW5zcGFyZW50OworfQorCisvKiBIYW5kbGUgKi8KKzo6LXdlYmtpdC1zY3JvbGxiYXItdGh1 bWIgeworICBiYWNrZ3JvdW5kOiAkc2Nyb2xsYmFyLWNvbG9yOworICBib3JkZXItcmFkaXVzOiAk Ym9yZGVyLXJhZGl1czsKK30KKworLyogSGFuZGxlIG9uIGhvdmVyICovCis6Oi13ZWJraXQtc2Ny b2xsYmFyLXRodW1iOmhvdmVyIHsKKyAgYmFja2dyb3VuZDogJHNjcm9sbGJhci1ob3Zlci1jb2xv cjsKK30KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL193ZWJjYWJpbi5wZ2Fk bWluLnNjc3MgYi93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9fd2ViY2FiaW4ucGdhZG1pbi5zY3Nz CmluZGV4IDkxZGZiNTdkMi4uZmNhMzdjOTc5IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0 aWMvc2Nzcy9fd2ViY2FiaW4ucGdhZG1pbi5zY3NzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9z Y3NzL193ZWJjYWJpbi5wZ2FkbWluLnNjc3MKQEAgLTI0LDcgKzI0LDcgQEAKIAogLndjRnJhbWVU aXRsZUJhciB7CiAgIGhlaWdodDogJHRpdGxlLWhlaWdodDsKLSAgYmFja2dyb3VuZC1jb2xvcjog JGNvbG9yLWJnOworICBiYWNrZ3JvdW5kLWNvbG9yOiAkaGVhZGVyLWJnOwogICBib3JkZXItYm90 dG9tOiAkcGFuZWwtYm9yZGVyOwogfQogCkBAIC01Miw3ICs1Miw3IEBACiAKIC53Y0ZyYW1lQnV0 dG9uQmFyIHsKICAgaGVpZ2h0OiAkdGl0bGUtaGVpZ2h0OwotICBiYWNrZ3JvdW5kLWNvbG9yOiAk Y29sb3ItYmc7CisgIGJhY2tncm91bmQtY29sb3I6IGluaGVyaXQ7CiAgIGJvcmRlci1ib3R0b206 ICRwYW5lbC1ib3JkZXI7CiAgIHBhZGRpbmc6IDByZW0gMC4yNXJlbTsKIApAQCAtMTYyLDcgKzE2 Miw3IEBACiAKIC53Y0Zsb2F0aW5nIC53Y0ZyYW1lVGl0bGVCYXIgewogICBoZWlnaHQ6ICR0aXRs ZS1oZWlnaHQ7Ci0gIGJhY2tncm91bmQtY29sb3I6ICRjb2xvci1iZzsKKyAgYmFja2dyb3VuZC1j b2xvcjogJGhlYWRlci1iZzsKICAgYm9yZGVyLWJvdHRvbTogJHBhbmVsLWJvcmRlcjsKIH0KIApk aWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvcmVzb3VyY2VzL19kZWZhdWx0LnZh cmlhYmxlcy5zY3NzIGIvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvcmVzb3VyY2VzL19kZWZhdWx0 LnZhcmlhYmxlcy5zY3NzCmluZGV4IGYwOWIxMWZiMS4uNTgwY2Q0ODNlIDEwMDY0NAotLS0gYS93 ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9yZXNvdXJjZXMvX2RlZmF1bHQudmFyaWFibGVzLnNjc3MK KysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvcmVzb3VyY2VzL19kZWZhdWx0LnZhcmlhYmxl cy5zY3NzCkBAIC01OCw2ICs1OCw4IEBAICRncmlkLWd1dHRlci13aWR0aDogMTVweDsKICRib3Jk ZXItcmFkaXVzOiAwLjI1cmVtOwogCiAkdGV4dC1tdXRlZDogJGNvbG9yLWdyYXktZGFyayAhZGVm YXVsdDsKKyRoZWFkZXItYmc6ICRjb2xvci1iZyAhZGVmYXVsdDsKKwogCiAkbmF2YmFyLWJnOiAk Y29sb3ItcHJpbWFyeTsKICRuYXZiYXItZm9udC1zaXplOiAwLjkyNXJlbTsKQEAgLTczLDYgKzc1 LDggQEAgJG5hdmJhci10b2dnbGVyLXBhZGRpbmcteTogMC4yNXJlbTsgLy9uby1jaGFuZ2UKICRm b3JtLWdyb3VwLW1hcmdpbi1ib3R0b206ICAwLjVyZW07CiAkYnRuLWFjdGl2ZS1ib3gtc2hhZG93 OiBub25lOwogCiskbmVnYXRpdmUtYmc6ICRjb2xvci1ncmF5LWxpZ2h0ICFkZWZhdWx0OworCiAk ZHJvcGRvd24tYmc6ICRjb2xvci1iZzsKICRkcm9wZG93bi1jb2xvcjogJGNvbG9yLWZnOwogJGRy b3Bkb3duLWxpbmstY29sb3I6ICRjb2xvci1mZzsKQEAgLTEwMCw3ICsxMDQsNyBAQCAkY2FyZC1z cGFjZXIteTogMHJlbTsKICRjYXJkLXNwYWNlci14OiAwcmVtOwogJGNhcmQtYm9yZGVyLXJhZGl1 czogJGJvcmRlci1yYWRpdXM7CiAkY2FyZC1ib3JkZXItY29sb3I6ICRib3JkZXItY29sb3I7Ci0k Y2FyZC1jYXAtYmc6ICRjb2xvci1iZzsKKyRjYXJkLWNhcC1iZzogJGhlYWRlci1iZzsKICRjYXJk LWJnOiAkY29sb3ItYmc7CiAKICRuYXZiYXItcGFkZGluZy15OiAwcmVtOwpAQCAtMTM5LDYgKzE0 MywxMSBAQCAkaW5wdXQtYm9yZGVyLXdpZHRoOiAkaW5wdXQtYnRuLWJvcmRlci13aWR0aDsKICRp bnB1dC1idG4tcGFkZGluZy15OiAuMjVyZW07CiAkaW5wdXQtYnRuLXBhZGRpbmcteDogLjc1cmVt OwogCiskYnRuLXByaW1hcnktY29sb3I6ICRjb2xvci1wcmltYXJ5LWZnOworJGJ0bi1zdWNjZXNz LWNvbG9yOiAkY29sb3Itc3VjY2Vzcy1mZzsKKyRidG4td2FybmluZy1jb2xvcjogJGNvbG9yLXdh cm5pbmctZmc7CiskYnRuLWRhbmdlci1jb2xvcjogJGNvbG9yLWRhbmdlci1mZzsKKwogJGNvbXBv bmVudC1hY3RpdmUtYmc6ICRjb2xvci1wcmltYXJ5OwogJGlucHV0LWJ0bi1mb2N1cy13aWR0aDog LjJyZW07CiAkaW5wdXQtYnRuLWZvY3VzLWNvbG9yOiByZ2JhKCRjb21wb25lbnQtYWN0aXZlLWJn LCAuMjUpOwpAQCAtMTgzLDcgKzE5Miw3IEBAICRzcGxpdHRlci1ob3Zlci13aWR0aDogN3B4Owog CiAkZHJvcGRvd24tc3VibWVudS10b3A6IC0kZHJvcGRvd24tc3BhY2VyOwogCi0kdGFibGUtYmc6 ICRjb2xvci1iZzsKKyR0YWJsZS1iZzogJGNvbG9yLWJnICFkZWZhdWx0OwogJHRhYmxlLWJnLXNl bGVjdGVkOiAkY29sb3ItcHJpbWFyeS1saWdodDsKICR0YWJsZS1ob3Zlci1ib3JkZXItY29sb3I6 ICRjb2xvci1wcmltYXJ5OwogJHRhYmxlLWhvdmVyLWJvcmRlcjogJHBhbmVsLWJvcmRlci13aWR0 aCBzb2xpZCAkY29sb3ItcHJpbWFyeSAhaW1wb3J0YW50OwpAQCAtMjA1LDcgKzIxNCw3IEBAICRz cWwtdGl0bGUtYmc6ICM1YjZkN2M7CiAkc3FsLXRpdGxlLWZnOiAkd2hpdGU7CiAvLyBUb29sYmFy ICsgZWRpdG9yIHRpdGxlIGhlaWdodHMgKyB0aXRsZSBib3R0b20gYm9yZGVyCiAkc3FsLWVkaXRv ci1wYW5lbC10b3A6ICR0aXRsZS1oZWlnaHQgKyAkdGV4dC1oZWlnaHQtY2FsYyoxNnB4ICsgJHNx bC10aXRsZS1wYWRkaW5nKjIgKyAkcGFuZWwtYm9yZGVyLXdpZHRoOwotJHNxbC1ndXR0ZXJzLWJn OiAkY29sb3ItZ3JheS1saWdodDsKKyRzcWwtZ3V0dGVycy1iZzogJG5lZ2F0aXZlLWJnOwogJHNx bC1oaXN0b3J5LWRldGFpbC1iZzogJGNvbG9yLWdyYXktbGlnaHRlcjsKICRzcWwtaGlzdG9yeS1z dWNjZXNzLWJnOiAkY29sb3ItcHJpbWFyeS1saWdodDsKICRzcWwtaGlzdG9yeS1zdWNjZXNzLWZn OiAkYWN0aXZlLWNvbG9yOwpAQCAtMjI0LDcgKzIzMyw2IEBAICRleHBsYWluLXNldi00LWJnOiAj ODgwMDAwICFkZWZhdWx0OwogJGV4cGxhaW4tc2V2LTMtY29sb3I6ICNGRkZGRkYgIWRlZmF1bHQ7 CiAkZXhwbGFpbi1zZXYtNC1jb2xvcjogI0ZGRkZGRiAhZGVmYXVsdDsKIAotJG5lZ2F0aXZlLWJn OiAkY29sb3ItZ3JheS1saWdodCAhZGVmYXVsdDsKICRkaWFsb2ctYm94LXNoYWRvdzogMCAwLjVy ZW0gM3JlbSAkc2hhZG93LWJhc2UtY29sb3I7CiAKICRhbGVydC1pY29uLWNvbG9yOiAkd2hpdGU7 CkBAIC0yMzgsNiArMjQ2LDkgQEAgJG5vLWJvcmRlci1yYWRpdXM6IDBweCAhaW1wb3J0YW50Owog CiAkYnRuLWNoZWNrYm94LXBhZGRpbmc6ICRpbnB1dC1idG4tcGFkZGluZy15ICRpbnB1dC1idG4t cGFkZGluZy14OwogCiskc2Nyb2xsYmFyLWNvbG9yOiAkY29sb3ItZ3JheSAhZGVmYXVsdDsKKyRz Y3JvbGxiYXItaG92ZXItY29sb3I6ICRjb2xvci1ncmF5LWRhcmsgIWRlZmF1bHQ7CisKICRzZWN1 cml0eS10ZXh0LWNvbG9yOiAkd2hpdGU7CiAkc2VjdXJpdHktYnRuLWNvbG9yOiAjMDM4YmJhOwog CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9yZXNvdXJjZXMvX3RoZW1lLnZh cmlhYmxlcy5zY3NzLnNhbXBsZSBiL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL3Jlc291cmNlcy9f dGhlbWUudmFyaWFibGVzLnNjc3Muc2FtcGxlCmluZGV4IDMwYmMwNjA2MC4uYjM1ZDUzODA1IDEw MDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9yZXNvdXJjZXMvX3RoZW1lLnZhcmlh Ymxlcy5zY3NzLnNhbXBsZQorKysgYi93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9yZXNvdXJjZXMv X3RoZW1lLnZhcmlhYmxlcy5zY3NzLnNhbXBsZQpAQCAtNDksNiArNDksMTAgQEAgJHBvcG92ZXIt Ym9keS1jb2xvcjogJGNvbG9yLWZnOwogCiAkYWN0aXZlLWNvbG9yOiAkY29sb3ItcHJpbWFyeTsK IAorJGhlYWRlci1iZzogJGNvbG9yLWdyYXktbGlnaHRlcjsKKworJHRhYmxlLWJnOiAkY29sb3It Z3JheS1saWdodGVyOworCiAkY29sb3ItZWRpdG9yLWZnOiAkY29sb3ItZmc7CiAkY29sb3ItZWRp dG9yLWtleXdvcmQ6ICM5MDg7CiAkY29sb3ItZWRpdG9yLW51bWJlcjogIzk2NDsKQEAgLTcwLDUg Kzc0LDkgQEAgJGV4cGxhaW4tc2V2LTQtY29sb3I6ICNGRkZGRkY7CiAKICRuZWdhdGl2ZS1iZzog JGNvbG9yLWdyYXktbGlnaHQ7CiAKKy8qIFdvcmtzIG9ubHkgd2l0aCBjaHJvbWl1bSBicm93c2Vy cyAqLworJHNjcm9sbGJhci1jb2xvcjogICRjb2xvci1ncmF5LWxpZ2h0ZXIhZGVmYXVsdDsKKyRz Y3JvbGxiYXItaG92ZXItY29sb3I6ICM2NjY2NjYgIWRlZmF1bHQ7CisKICRsb2FkZXItaWNvbiA6 IHVybCgiZGF0YTppbWFnZS9zdmcreG1sO2NoYXJzZXQ9VVRGLTgsJTNjP3htbCB2ZXJzaW9uPScx LjAnIGVuY29kaW5nPSd1dGYtOCc/JTNlJTNjc3ZnIHZlcnNpb249JzEuMScgaWQ9J0xheWVyXzEn IHhtbG5zPSdodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZycgeG1sbnM6eGxpbms9J2h0dHA6Ly93 d3cudzMub3JnLzE5OTkveGxpbmsnIHg9JzBweCcgeT0nMHB4JyB2aWV3Qm94PScwIDAgMzggMzgn IHN0eWxlPSdlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDM4IDM4OycgeG1sOnNwYWNlPSdwcmVz ZXJ2ZSclM2UlM2NzdHlsZSB0eXBlPSd0ZXh0L2NzcyclM2UgLnN0MCU3YmZpbGw6bm9uZTtzdHJv a2U6JTIzZWJlZWYzO3N0cm9rZS13aWR0aDoyOyU3ZCAuc3QxJTdiZmlsbDpub25lO3N0cm9rZTol MjMzMjY2OTA7c3Ryb2tlLXdpZHRoOjI7JTdkICUzYy9zdHlsZSUzZSUzY2clM2UlM2NnIHRyYW5z Zm9ybT0ndHJhbnNsYXRlKDEgMSknJTNlJTNjY2lyY2xlIGNsYXNzPSdzdDAnIGN4PScxOCcgY3k9 JzE4JyByPScxOCcvJTNlJTNjcGF0aCBjbGFzcz0nc3QxJyBkPSdNMzYsMThjMC05LjktOC4xLTE4 LTE4LTE4ICclM2UlM2NhbmltYXRlVHJhbnNmb3JtIGFjY3VtdWxhdGU9J25vbmUnIGFkZGl0aXZl PSdyZXBsYWNlJyBhdHRyaWJ1dGVOYW1lPSd0cmFuc2Zvcm0nIGNhbGNNb2RlPSdsaW5lYXInIGR1 cj0nMC43cycgZmlsbD0ncmVtb3ZlJyBmcm9tPScwIDE4IDE4JyByZXBlYXRDb3VudD0naW5kZWZp bml0ZScgcmVzdGFydD0nYWx3YXlzJyB0bz0nMzYwIDE4IDE4JyB0eXBlPSdyb3RhdGUnJTNlJTNj L2FuaW1hdGVUcmFuc2Zvcm0lM2UlM2MvcGF0aCUzZSUzYy9nJTNlJTNjL2clM2UlM2Mvc3ZnJTNl ICIpICFkZWZhdWx0OwogJGxvYWRlci1pY29uLXNtYWxsOiB1cmwoImRhdGE6aW1hZ2Uvc3ZnK3ht bCwlM0MlM0Z4bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0ndXRmLTgnJTNGJTNFJTNDIS0tIEdl bmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMjMuMS4xLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBT VkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAtLSUzRSUzQ3N2ZyB2ZXJzaW9uPScxLjEnIGlkPSdM YXllcl8xJyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHhtbG5zOnhsaW5rPSdo dHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rJyB4PScwcHgnIHk9JzBweCcgdmlld0JveD0nMCAw IDM4IDM4JyBzdHlsZT0nZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAzOCAzODsnIHhtbDpzcGFj ZT0ncHJlc2VydmUnJTNFJTNDc3R5bGUgdHlwZT0ndGV4dC9jc3MnJTNFIC5zdDAlN0JmaWxsOm5v bmU7c3Ryb2tlOiUyM0VCRUVGMztzdHJva2Utd2lkdGg6NTslN0QgLnN0MSU3QmZpbGw6bm9uZTtz dHJva2U6JTIzMjIyMjIyO3N0cm9rZS13aWR0aDo1OyU3RCUwQSUzQy9zdHlsZSUzRSUzQ2clM0Ul M0NnIHRyYW5zZm9ybT0ndHJhbnNsYXRlKDEgMSknJTNFJTNDY2lyY2xlIGNsYXNzPSdzdDAnIGN4 PScxOCcgY3k9JzE4JyByPScxNicvJTNFJTNDcGF0aCBjbGFzcz0nc3QxJyBkPSdNMzQsMThjMC04 LjgtNy4yLTE2LTE2LTE2ICclM0UlM0NhbmltYXRlVHJhbnNmb3JtIGFjY3VtdWxhdGU9J25vbmUn IGFkZGl0aXZlPSdyZXBsYWNlJyBhdHRyaWJ1dGVOYW1lPSd0cmFuc2Zvcm0nIGNhbGNNb2RlPSds aW5lYXInIGR1cj0nMC43cycgZmlsbD0ncmVtb3ZlJyBmcm9tPScwIDE4IDE4JyByZXBlYXRDb3Vu dD0naW5kZWZpbml0ZScgcmVzdGFydD0nYWx3YXlzJyB0bz0nMzYwIDE4IDE4JyB0eXBlPSdyb3Rh dGUnJTNFJTNDL2FuaW1hdGVUcmFuc2Zvcm0lM0UlM0MvcGF0aCUzRSUzQy9nJTNFJTNDL2clM0Ul M0Mvc3ZnJTNFJTBBIikgIWRlZmF1bHQ7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMv c2Nzcy9yZXNvdXJjZXMvZGFyay9fdGhlbWUudmFyaWFibGVzLnNjc3MgYi93ZWIvcGdhZG1pbi9z dGF0aWMvc2Nzcy9yZXNvdXJjZXMvZGFyay9fdGhlbWUudmFyaWFibGVzLnNjc3MKaW5kZXggZGVm ZDU2YTlhLi4zZDA0NjIzNWIgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL3Jl c291cmNlcy9kYXJrL190aGVtZS52YXJpYWJsZXMuc2NzcworKysgYi93ZWIvcGdhZG1pbi9zdGF0 aWMvc2Nzcy9yZXNvdXJjZXMvZGFyay9fdGhlbWUudmFyaWFibGVzLnNjc3MKQEAgLTEsMjMgKzEs MjMgQEAKICR3aGl0ZTogI2ZmZjsKICRibGFjazogIzAwMDsKIAotJGNvbG9yLWJnOiAjMjIyOwor JGNvbG9yLWJnOiAjMjEyMTIxOwogJGNvbG9yLWZnOiAjZGRkOwogCi0kY29sb3ItcHJpbWFyeTog IzQwNjE3ZDsKLSRjb2xvci1wcmltYXJ5LWZnOiAkd2hpdGU7CiskY29sb3ItcHJpbWFyeTogIzIz NGQ2ZTsKKyRjb2xvci1wcmltYXJ5LWZnOiAkY29sb3ItZmc7CiAkY29sb3ItcHJpbWFyeS1saWdo dDogIzUzNjI3MDsKICRjb2xvci1wcmltYXJ5LWxpZ2h0LWZnOiAkY29sb3ItcHJpbWFyeS1mZzsK ICRjb2xvci1wcmltYXJ5LWRhcms6ICMxNTM1NGY7CiAKLSRjb2xvci1zZWNvbmRhcnk6ICM0MjQy NDI7CiskY29sb3Itc2Vjb25kYXJ5OiAjNmI2YjZiOwogCi0kY29sb3ItZGFuZ2VyOiAjZmY1Mzcw OworJGNvbG9yLWRhbmdlcjogI2RhNjc1ODsKICRjb2xvci1kYW5nZXItZmc6ICR3aGl0ZTsKICRj b2xvci1kYW5nZXItbGlnaHQ6ICM5MTQ2NDk7Ci0kY29sb3ItZGFuZ2VyLWxpZ2h0ZXI6ICM4Zjgy ODI7CiskY29sb3ItZGFuZ2VyLWxpZ2h0ZXI6ICMyMTIxMjE7CiAKLSRjb2xvci1zdWNjZXNzOiAj NmJhYTdmOworJGNvbG9yLXN1Y2Nlc3M6ICMxYTUyMmI7CiAkY29sb3Itc3VjY2Vzcy1mZzogJGJs YWNrOwogJGNvbG9yLXN1Y2Nlc3MtbGlnaHQ6ICM1YTc4NjM7CiAKQEAgLTI1LDIxICsyNSwxOCBA QCAkY29sb3Itd2FybmluZzogI2VlYTIzNjsKICRjb2xvci13YXJuaW5nLWZnOiAkYmxhY2s7CiAk Y29sb3Itd2FybmluZy1saWdodDogI2ZjZTVjNTsKIAotLyogRm9yIGRhcmsgdGhlbWUgLSBjb2xv cnMgYXJlIGluIHJldmVyc2Ugb3JkZXIKLSAqIGdyYXktZGFyayBpcyBsaWdodGVyIHRoZW4gZ3Jh eS1saWdodAotICovCi0kY29sb3ItZ3JheS1kYXJrOiAjNTk1OTU5OwotJGNvbG9yLWdyYXk6ICM0 MjQyNDI7CiskY29sb3ItZ3JheS1kYXJrOiAjMjEyMTIxOworJGNvbG9yLWdyYXk6ICMyZTJlMmU7 CiAkY29sb3ItZ3JheS1saWdodDogIzMwMzAzMDsKLSRjb2xvci1ncmF5LWxpZ2h0ZXI6ICMyMTIx MjE7CiskY29sb3ItZ3JheS1saWdodGVyOiAjNDI0MjQyOwogCiAkY29sb3ItYnJhbmQ6ICR3aGl0 ZTsKIAotJGJvcmRlci1jb2xvcjogJGNvbG9yLWdyYXk7Ci0kc2hhZG93LWJhc2UtY29sb3I6ICRj b2xvci1ncmF5LWxpZ2h0ZXI7CiskYm9yZGVyLWNvbG9yOiAjNGE0YTRhOworJHNoYWRvdy1iYXNl LWNvbG9yOiAjMTExMTExOwogCiAkdGV4dC1tdXRlZDogIzlkOWZhMTsKLSRpbnB1dC1iZzogJGNv bG9yLWdyYXktbGlnaHRlcjsKKyRpbnB1dC1iZzogJGNvbG9yLWdyYXktbGlnaHQ7CiAkaW5wdXQt Y29sb3I6ICRjb2xvci1mZzsKICRpbnB1dC1kaXNhYmxlZC1iZzogJGNvbG9yLWJnOwogCkBAIC00 OCwxNiArNDUsMjAgQEAgJHBvcG92ZXItYm9keS1jb2xvcjogJGNvbG9yLWZnOwogCiAkYWN0aXZl LWNvbG9yOiAkY29sb3ItZmc7CiAKLSRjb2xvci1lZGl0b3ItZmc6ICM5Y2RjZmU7Ci0kY29sb3It ZWRpdG9yLWtleXdvcmQ6ICNjNTg2ODA7Ci0kY29sb3ItZWRpdG9yLW51bWJlcjogIzgxYmI2NzsK LSRjb2xvci1lZGl0b3Itc3RyaW5nOiAjZGNkY2FhOwotJGNvbG9yLWVkaXRvci12YXJpYWJsZTog IzljZGNmZTsKLSRjb2xvci1lZGl0b3ItdmFyaWFibGUtMjogIzljZGNmZTsKLSRjb2xvci1lZGl0 b3ItYnVpbHRpbjogI2RjZGNhYTsKLSRjb2xvci1lZGl0b3ItY29tbWVudDogIzgxYmI2NzsKLSRj b2xvci1lZGl0b3ItYnJhY2tldDogI2Q0ZDRkNDsKLSRjb2xvci1lZGl0b3Itb3BlcmF0b3I6ICNk NGQ0ZDQ7CiskaGVhZGVyLWJnOiAkY29sb3ItZ3JheS1saWdodGVyOworCiskdGFibGUtYmc6ICRj b2xvci1ncmF5LWxpZ2h0ZXI7CisKKyRjb2xvci1lZGl0b3ItZmc6ICM3ZGM5ZjE7CiskY29sb3It ZWRpdG9yLWtleXdvcmQ6ICNkYjdjNzQ7CiskY29sb3ItZWRpdG9yLW51bWJlcjogIzdmY2M1YzsK KyRjb2xvci1lZGl0b3Itc3RyaW5nOiAjZTRlNDg3OworJGNvbG9yLWVkaXRvci12YXJpYWJsZTog IzdkYzlmMTsKKyRjb2xvci1lZGl0b3ItdmFyaWFibGUtMjogIzdkYzlmMTsKKyRjb2xvci1lZGl0 b3ItYnVpbHRpbjogI2U0ZTQ4NzsKKyRjb2xvci1lZGl0b3ItY29tbWVudDogIzdmY2M1YzsKKyRj b2xvci1lZGl0b3ItYnJhY2tldDogI2Q2YWFhYTsKKyRjb2xvci1lZGl0b3Itb3BlcmF0b3I6ICNk NmFhYWE7CiAkY29sb3ItZWRpdG9yLWZvbGRtYXJrZXI6ICMwMDAwRkYgIWRlZmF1bHQ7CiAkY29s b3ItZWRpdG9yLWFjdGl2ZWxpbmU6ICM1MEIwRjAgIWRlZmF1bHQ7CiAKQEAgLTY5LDUgKzcwLDgg QEAgJGV4cGxhaW4tc2V2LTQtY29sb3I6ICRjb2xvci1mZzsKIAogJG5lZ2F0aXZlLWJnOiAkY29s b3ItYmc7CiAKKyRzY3JvbGxiYXItY29sb3I6ICAkY29sb3ItZ3JheS1saWdodGVyIWRlZmF1bHQ7 Ciskc2Nyb2xsYmFyLWhvdmVyLWNvbG9yOiAjNjY2NjY2ICFkZWZhdWx0OworCiAkbG9hZGVyLWlj b24gOiB1cmwoImRhdGE6aW1hZ2Uvc3ZnK3htbDtjaGFyc2V0PVVURi04LCUzYz94bWwgdmVyc2lv bj0nMS4wJyBlbmNvZGluZz0ndXRmLTgnPyUzZSUzY3N2ZyB2ZXJzaW9uPScxLjEnIGlkPSdMYXll cl8xJyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHhtbG5zOnhsaW5rPSdodHRw Oi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rJyB4PScwcHgnIHk9JzBweCcgdmlld0JveD0nMCAwIDM4 IDM4JyBzdHlsZT0nZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAzOCAzODsnIHhtbDpzcGFjZT0n cHJlc2VydmUnJTNlJTNjc3R5bGUgdHlwZT0ndGV4dC9jc3MnJTNlIC5zdDAlN2JmaWxsOm5vbmU7 c3Ryb2tlOiUyM2ViZWVmMztzdHJva2Utd2lkdGg6MjslN2QgLnN0MSU3YmZpbGw6bm9uZTtzdHJv a2U6JTIzNDA2MTdkO3N0cm9rZS13aWR0aDoyOyU3ZCAlM2Mvc3R5bGUlM2UlM2NnJTNlJTNjZyB0 cmFuc2Zvcm09J3RyYW5zbGF0ZSgxIDEpJyUzZSUzY2NpcmNsZSBjbGFzcz0nc3QwJyBjeD0nMTgn IGN5PScxOCcgcj0nMTgnLyUzZSUzY3BhdGggY2xhc3M9J3N0MScgZD0nTTM2LDE4YzAtOS45LTgu MS0xOC0xOC0xOCAnJTNlJTNjYW5pbWF0ZVRyYW5zZm9ybSBhY2N1bXVsYXRlPSdub25lJyBhZGRp dGl2ZT0ncmVwbGFjZScgYXR0cmlidXRlTmFtZT0ndHJhbnNmb3JtJyBjYWxjTW9kZT0nbGluZWFy JyBkdXI9JzAuN3MnIGZpbGw9J3JlbW92ZScgZnJvbT0nMCAxOCAxOCcgcmVwZWF0Q291bnQ9J2lu ZGVmaW5pdGUnIHJlc3RhcnQ9J2Fsd2F5cycgdG89JzM2MCAxOCAxOCcgdHlwZT0ncm90YXRlJyUz ZSUzYy9hbmltYXRlVHJhbnNmb3JtJTNlJTNjL3BhdGglM2UlM2MvZyUzZSUzYy9nJTNlJTNjL3N2 ZyUzZSAiKSAhZGVmYXVsdDsKICRsb2FkZXItaWNvbi1zbWFsbDogdXJsKCJkYXRhOmltYWdlL3N2 Zyt4bWwsJTNDJTNGeG1sIHZlcnNpb249JzEuMCcgZW5jb2Rpbmc9J3V0Zi04JyUzRiUzRSUzQyEt LSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDIzLjEuMSwgU1ZHIEV4cG9ydCBQbHVnLUlu IC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgLS0lM0UlM0NzdmcgdmVyc2lvbj0nMS4xJyBp ZD0nTGF5ZXJfMScgeG1sbnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyB4bWxuczp4bGlu az0naHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluaycgeD0nMHB4JyB5PScwcHgnIHZpZXdCb3g9 JzAgMCAzOCAzOCcgc3R5bGU9J2VuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzggMzg7JyB4bWw6 c3BhY2U9J3ByZXNlcnZlJyUzRSUzQ3N0eWxlIHR5cGU9J3RleHQvY3NzJyUzRSAuc3QwJTdCZmls bDpub25lO3N0cm9rZTolMjNFQkVFRjM7c3Ryb2tlLXdpZHRoOjU7JTdEIC5zdDElN0JmaWxsOm5v bmU7c3Ryb2tlOiUyMzQwNjE3ZDtzdHJva2Utd2lkdGg6NTslN0QlMEElM0Mvc3R5bGUlM0UlM0Nn JTNFJTNDZyB0cmFuc2Zvcm09J3RyYW5zbGF0ZSgxIDEpJyUzRSUzQ2NpcmNsZSBjbGFzcz0nc3Qw JyBjeD0nMTgnIGN5PScxOCcgcj0nMTYnLyUzRSUzQ3BhdGggY2xhc3M9J3N0MScgZD0nTTM0LDE4 YzAtOC44LTcuMi0xNi0xNi0xNiAnJTNFJTNDYW5pbWF0ZVRyYW5zZm9ybSBhY2N1bXVsYXRlPSdu b25lJyBhZGRpdGl2ZT0ncmVwbGFjZScgYXR0cmlidXRlTmFtZT0ndHJhbnNmb3JtJyBjYWxjTW9k ZT0nbGluZWFyJyBkdXI9JzAuN3MnIGZpbGw9J3JlbW92ZScgZnJvbT0nMCAxOCAxOCcgcmVwZWF0 Q291bnQ9J2luZGVmaW5pdGUnIHJlc3RhcnQ9J2Fsd2F5cycgdG89JzM2MCAxOCAxOCcgdHlwZT0n cm90YXRlJyUzRSUzQy9hbmltYXRlVHJhbnNmb3JtJTNFJTNDL3BhdGglM0UlM0MvZyUzRSUzQy9n JTNFJTNDL3N2ZyUzRSUwQSIpICFkZWZhdWx0OwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9v bHMvZGF0YWdyaWQvdGVtcGxhdGVzL2RhdGFncmlkL2luZGV4Lmh0bWwgYi93ZWIvcGdhZG1pbi90 b29scy9kYXRhZ3JpZC90ZW1wbGF0ZXMvZGF0YWdyaWQvaW5kZXguaHRtbAppbmRleCAzMGU4N2M1 NTguLjljMDVlNjQxYiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvZGF0YWdyaWQvdGVt cGxhdGVzL2RhdGFncmlkL2luZGV4Lmh0bWwKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvZGF0YWdy aWQvdGVtcGxhdGVzL2RhdGFncmlkL2luZGV4Lmh0bWwKQEAgLTIyMCw3ICsyMjAsNyBAQAogICAg ICAgICAgICAgICAgIDwvdWw+CiAgICAgICAgICAgICA8L2Rpdj4KICAgICAgICAgICAgIDxkaXYg Y2xhc3M9ImJ0bi1ncm91cCBtci0xIiByb2xlPSJncm91cCIgYXJpYS1sYWJlbD0iIj4KLSAgICAg ICAgICAgICAgICA8c2VsZWN0IGlkPSJidG4tcm93cy1saW1pdCIgY2xhc3M9ImxpbWl0IiBkaXNh YmxlZAorICAgICAgICAgICAgICAgIDxzZWxlY3QgaWQ9ImJ0bi1yb3dzLWxpbWl0IiBjbGFzcz0i bGltaXQgZm9ybS1jb250cm9sIGZvcm0tY29udHJvbC1zbSIgZGlzYWJsZWQKICAgICAgICAgICAg ICAgICAgICAgICAgIHRpdGxlPSIiCiAgICAgICAgICAgICAgICAgICAgICAgICBhY2Nlc3NrZXk9 IiIKICAgICAgICAgICAgICAgICAgICAgICAgIHRhYmluZGV4PSIwIj4KZGlmZiAtLWdpdCBhL3dl Yi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0aWMvY3NzL3NxbGVkaXRvci5jc3MgYi93ZWIv cGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3RhdGljL2Nzcy9zcWxlZGl0b3IuY3NzCmluZGV4IDYy YzBmMmM1Ni4uMDMxYTg3NDQ0IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0 b3Ivc3RhdGljL2Nzcy9zcWxlZGl0b3IuY3NzCisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVk aXRvci9zdGF0aWMvY3NzL3NxbGVkaXRvci5jc3MKQEAgLTI1Miw2ICsyNTIsNyBAQCBpbnB1dC5l ZGl0b3ItY2hlY2tib3g6Zm9jdXMgewogCiAuY29ubmVjdGlvbl9zdGF0dXMgewogICBmb250LXNp emU6IDFyZW07CisgIHdpZHRoOiA0MHB4OwogfQogCiAuaWNvbi1xdWVyeS10b29sLWNvbm5lY3Rl ZDpiZWZvcmUgewpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL3N0YXRp Yy9zY3NzL19zcWxlZGl0b3Iuc2NzcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0 aWMvc2Nzcy9fc3FsZWRpdG9yLnNjc3MKaW5kZXggMGVjZmMzODk0Li43NGEyZDgwMzcgMTAwNjQ0 Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0aWMvc2Nzcy9fc3FsZWRpdG9y LnNjc3MKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL3N0YXRpYy9zY3NzL19zcWxl ZGl0b3Iuc2NzcwpAQCAtMTgsNiArMTgsMTAgQEAKICAgei1pbmRleDogMDsKIH0KIAorLmNvbm5l Y3Rpb25fc3RhdHVzIHsKKyAgYmFja2dyb3VuZC1jb2xvcjogJGNvbG9yLXByaW1hcnk7CisgIGNv bG9yOiAkY29sb3ItcHJpbWFyeS1mZzsKK30KIAogLmVkaXRvci10aXRsZSB7CiAgIHBhZGRpbmc6 ICRzcWwtdGl0bGUtcGFkZGluZzsKQEAgLTM5LDEwICs0Myw2IEBACiAgIGJhY2tncm91bmQ6ICRj b2xvci1wcmltYXJ5LWxpZ2h0OwogfQogCi0uY29ubmVjdGlvbl9zdGF0dXMgewotICB3aWR0aDog NDBweDsKLX0KLQogCiAuYWpzLWJvZHkgLndhcm4taWNvbiB7CiAgIGNvbG9yOiAkY29sb3Itd2Fy bmluZzsKQEAgLTU3LDE2ICs1Nyw2IEBACiAgIGJvcmRlci1ib3R0b206ICRwYW5lbC1ib3JkZXI7 CiB9CiAKLS5jb25uZWN0aW9uX3N0YXR1cyAuZmEtY2xvY2stbywKLS5jb25uZWN0aW9uX3N0YXR1 cyAuZmEtaG91cmdsYXNzLWhhbGYgewotICBjb2xvcjogJGNvbG9yLXdhcm5pbmc7Ci19Ci0KLS5j b25uZWN0aW9uX3N0YXR1cyAuZmEtZXhjbGFtYXRpb24tY2lyY2xlLAotLmNvbm5lY3Rpb25fc3Rh dHVzIC5mYS1leGNsYW1hdGlvbi10cmlhbmdsZSB7Ci0gIGNvbG9yOiAkY29sb3ItZGFuZ2VyOwot fQotCiBsaS5Db2RlTWlycm9yLWhpbnQtYWN0aXZlIHsKICAgYmFja2dyb3VuZDogJGNvbG9yLXBy aW1hcnktbGlnaHQ7CiAgIGNvbG9yOiAkY29sb3ItcHJpbWFyeS1mZzsKQEAgLTMzMCwxNCArMzIw LDYgQEAgZGl2LnN0cmlrZW91dDphZnRlciB7CiAgIH0KIH0KIAotLmljb24tcXVlcnktdG9vbC1j b25uZWN0ZWQgewotICBjb2xvcjogJGNvbG9yLXByaW1hcnk7Ci19Ci0KLS5pY29uLXF1ZXJ5LXRv b2wtZGlzY29ubmVjdGVkIHsKLSAgY29sb3I6ICRjb2xvci1kYW5nZXI7Ci19Ci0KIC5jb25uZWN0 aW9uX3N0YXR1cyAub2J0YWluaW5nLWNvbm4gewogICBiYWNrZ3JvdW5kLWltYWdlOiAkbG9hZGVy LWljb24tc21hbGwgIWltcG9ydGFudDsKICAgYmFja2dyb3VuZC1wb3NpdGlvbjogY2VudGVyIGNl bnRlcjsKZGlmZiAtLWdpdCBhL3dlYi93ZWJwYWNrLmNvbmZpZy5qcyBiL3dlYi93ZWJwYWNrLmNv bmZpZy5qcwppbmRleCAyYWNhYWNiNTUuLmZkMzBjYWUwNiAxMDA2NDQKLS0tIGEvd2ViL3dlYnBh Y2suY29uZmlnLmpzCisrKyBiL3dlYi93ZWJwYWNrLmNvbmZpZy5qcwpAQCAtMzUsNiArMzUsNyBA QCBjb25zdCBkZXZUb29sVmFsID0gUFJPRFVDVElPTiA/IGZhbHNlIDogJ2V2YWwnOwogY29uc3Qg YW5hbHl6ZXJNb2RlID0gcHJvY2Vzcy5lbnYuQU5BTFlaRT09J3RydWUnID8gJ3N0YXRpYycgOiAn ZGlzYWJsZWQnOwogCiBjb25zdCBvdXRwdXRQYXRoID0gX19kaXJuYW1lICsgJy9wZ2FkbWluL3N0 YXRpYy9qcy9nZW5lcmF0ZWQnOworY29uc3QgcGdhZG1pblRoZW1lc0pzb24gPSAncGdhZG1pbi50 aGVtZXMuanNvbic7CiAKIC8vIEV4cG9zZSBsaWJyYXJpZXMgaW4gYXBwIGNvbnRleHQgc28gdGhl eSBuZWVkIG5vdCB0bwogLy8gcmVxdWlyZSgnbGlibmFtZScpIHdoZW4gdXNlZCBpbiBhIG1vZHVs ZQpAQCAtODQsNyArODUsNiBAQCBjb25zdCBidW5kbGVBbmFseXplciA9IG5ldyBCdW5kbGVBbmFs eXplclBsdWdpbih7CiAgIHJlcG9ydEZpbGVuYW1lOiAnYW5hbHl6ZV9yZXBvcnQuaHRtbCcsCiB9 KTsKIAotbGV0IHBnYWRtaW5UaGVtZXNKc29uID0gJ3BnYWRtaW4udGhlbWVzLmpzb24nOwogY29u c3QgY29weUZpbGVzID0gbmV3IENvcHlQbHVnaW4oWwogICBwZ2FkbWluVGhlbWVzSnNvbiwKICAg ewo= --0000000000003c00a205970ee3e9--