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 1gjKmy-0000eo-NX for pgadmin-hackers@arkaria.postgresql.org; Tue, 15 Jan 2019 09:13:41 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1gjKmx-0006io-DD for pgadmin-hackers@arkaria.postgresql.org; Tue, 15 Jan 2019 09:13:39 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gjKmw-0006dj-Mt for pgadmin-hackers@lists.postgresql.org; Tue, 15 Jan 2019 09:13:39 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gjKms-0004aI-TS for pgadmin-hackers@lists.postgresql.org; Tue, 15 Jan 2019 09:13:37 +0000 Received: by mail-lj1-x243.google.com with SMTP id c19-v6so1667744lja.5 for ; Tue, 15 Jan 2019 01:13:34 -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=dAre6CpBt0G9xwf60H8fVhzp/3tYPdxFev1yudGbiJ0=; b=DwDdCOzIvLmPYvFl3HgcTi9o89VF3mKByq3i9bMIs/HhjGgdta/okDlbRJDMnsr4SP Otto/7oPqdN2UQl1QZOFuVTW7EHgcu7ld+jasmqXhpPNkdJ5pZ6qCUxpl8FP2RKZXjtF kDpKVhAOfy6QUEKeDd3muwWwIzYRQqB7lQkNQgJH7fhWf+9qcg6VakxsgeAW/hQz/wO0 vtXQHkCqM/kj1T5QxBMabYk8M3orS7+YYLpwM90vKWEb3IQGFZdBoEw555DszqK2y5MO oX2zTVPfBPE8GSugHxyjjHrsMJ3tJA0ahpSITWuq7uKCfpCKC4VP1AgTUttf9X3dfTIC YWvg== 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=dAre6CpBt0G9xwf60H8fVhzp/3tYPdxFev1yudGbiJ0=; b=TJiTpP85yTLVSLXqpFm1kABubsDgH00cVnfcIn6Ioqkwq//bPs29aSar9n4etLejgP kPko1DCT/fjF5o8D/CpSd/fqEg8TDkRftfstRHCQd6r9VMDRkXpa8MqMbZOTJw87KJ5b 9KtfTuRH2MvCeAVyw5yg/mHRRc1qdZ6p16EFy3ji0BYTB133c7DZLO9CEIhhkT+N8nJI DkuQ23/yzzFN/4YjpjEJOtkIIK9xuPSPMVhURaaiwv+yGJntibBDCKGgARDFQVbjsXeU 8JFbWZTMb99QYBxKAS4WSQnFxbYYrNxjiMRZHrDP9UJ6wbSpOJchEGeiezb5s0ktU+0j 4bpw== X-Gm-Message-State: AJcUukfZtIpJrHfriAV++j7KCLO5gf+Ls9695tfUL16ReKCwrJoMJuQn +/JkylgD3AXx+ahicJDp5vA66erjJWACgRWIKRjNfw== X-Google-Smtp-Source: ALg8bN5p7xk0jAgs9vecnyoMnSF4aMoAb/3vBVLcShnH4OYTmcIWxC4qp9bLO8t80gH3TAeexfGSx90s/qsdNvX0Qew= X-Received: by 2002:a2e:9f0b:: with SMTP id u11-v6mr1834941ljk.99.1547543612423; Tue, 15 Jan 2019 01:13:32 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Aditya Toshniwal Date: Tue, 15 Jan 2019 14:43:19 +0530 Message-ID: Subject: Re: pgAdmin 4 commit: Improvement in the look and feel of the whole applica To: Dave Page Cc: Akshay Joshi , pgadmin-hackers Content-Type: multipart/mixed; boundary="0000000000004b31c5057f7b93bf" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --0000000000004b31c5057f7b93bf Content-Type: multipart/alternative; boundary="0000000000004b31c2057f7b93bd" --0000000000004b31c2057f7b93bd Content-Type: text/plain; charset="UTF-8" Hi Hackers, Please find the updated, rebased patch. Kindly review. On Mon, Jan 14, 2019 at 10:54 AM Aditya Toshniwal < aditya.toshniwal@enterprisedb.com> wrote: > Hi Hackers, > > Attached is the patch for further design improvements: > - Process watcher made fixed width with header changes, time details > rounded to 2 decimals > - Query history will show "No query history" if no query fired. Query > editor default size increased. > - Tree improvements - right bold border removed completely. Now click > anywhere on a tree item to perform actions. Please note, single click on > the tiny tree arrow button will not work with this. Clicking anywhere is > more useful than this. > - Fixed a bug where New folder create button not working when in List mode > and No files/folder present. > - Other minor improvements. > > Kindly review. > > On Mon, Jan 7, 2019 at 3:17 PM Aditya Toshniwal < > aditya.toshniwal@enterprisedb.com> wrote: > >> Hi Hackers, >> >> Attached is the patch for few more changes: >> - New Folder button was not working in file dialogue. Fixed that. >> - Color, icon changes in file dialogue >> - Also replaced the splash screen image (which is used on main dashboard >> also). It works fine on dashboard. However, I'm not sure of the splash >> screen as the new image is SVG and older was PNG. I have made changes for >> that in runtime code but I'm not able to test (evnvironment issue) runtime >> code :(. It would be helpful if someone else can try it once. >> >> Kindly review. >> >> >> On Mon, Jan 7, 2019 at 2:25 PM Dave Page wrote: >> >>> Thanks - applied! >>> >>> On Mon, Jan 7, 2019 at 10:44 AM Aditya Toshniwal >>> wrote: >>> > >>> > Hi Hackers, >>> > >>> > Attached is the patch to incorporate the changes discussed in trailing >>> mail(s). >>> > >>> > Kindly review. >>> > >>> > On Fri, Jan 4, 2019 at 3:31 PM Dave Page wrote: >>> >> >>> >> On Fri, Jan 4, 2019 at 9:58 AM Aditya Toshniwal >>> >> wrote: >>> >> > >>> >> > Hi, >>> >> > >>> >> > On Fri, Jan 4, 2019 at 2:53 PM Dave Page wrote: >>> >> >> >>> >> >> Hi >>> >> >> >>> >> >> On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal < >>> aditya.toshniwal@enterprisedb.com> wrote: >>> >> >>> >>> >> >>> Hi Dave, >>> >> >>> >>> >> >>> On Thu, Jan 3, 2019 at 8:39 PM Dave Page >>> wrote: >>> >> >>>> >>> >> >>>> >>> >> >>>> A few other things that I noticed (or have been bugging me): >>> >> >>>> >>> >> >>>> - The menu bar seems a little cramped. Taking pg-navbar from 32 >>> to 40px and setting the font-weight to normal on the menu options (but not >>> the product name) seems much better to me (and adjusting everything else as >>> required of course). >>> >> >>> >>> >> >>> Giving too much space for the navbar will reduce the usable space >>> for other things. It is good enough(32) to be used easily, and is equal to >>> all the other headers in app (including tabs) giving a feel of native >>> desktop application. You'll find even smaller menu heights in native >>> desktop application. We can make font weight to normal and may be slightly >>> increase horizontal spacing between the menu links. >>> >> >> >>> >> >> >>> >> >> 8 pixels isn't going to make a noticeable difference to the >>> workspace for users, and would leave the bar smaller than the 50px it's >>> been for the last couple of years (iirc). I think it needs it to avoid >>> looking cramped - please make the change. >>> >> > >>> >> > Will do. >>> >> > One more doubt regarding bold headers, should I remove bold headers >>> in dashboard graph header, subnode headers (eg.table->columns), properties >>> tab accrordian headers ? >>> >> >>> >> No, please don't. I left them bold and the styling seemed like it >>> >> worked. We can tweak again if others disagree later. >>> >> >>> >> Thanks! >>> >> >>> >> BTW - Chrome 71 shows the offset headers in the file dialogue as well. >>> >> >>> >> >>>> >>> >> >>>> - In the file dialogue, the column headers don't line up with >>> the columns in the rows. >>> >> >>> >>> >> >>> I could not see this on my machine (screenshot attached). Could >>> you please share the screenshot. >>> >> >> >>> >> >> >>> >> >> Attached - thanks! This is Chrome 70.0.3538.102 on MacOS. >>> >> >> >>> >> >> -- >>> >> >> Dave Page >>> >> >> Blog: http://pgsnake.blogspot.com >>> >> >> Twitter: @pgsnake >>> >> >> >>> >> >> EnterpriseDB UK: http://www.enterprisedb.com >>> >> >> The Enterprise PostgreSQL Company >>> >> > >>> >> > >>> >> > >>> >> > -- >>> >> > Thanks and Regards, >>> >> > Aditya Toshniwal >>> >> > Software Engineer | EnterpriseDB Software Solutions | 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 >>> > Software Engineer | EnterpriseDB Software Solutions | 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 >> Software Engineer | EnterpriseDB Software Solutions | Pune >> "Don't Complain about Heat, Plant a tree" >> > > > -- > Thanks and Regards, > Aditya Toshniwal > Software Engineer | EnterpriseDB Software Solutions | Pune > "Don't Complain about Heat, Plant a tree" > -- Thanks and Regards, Aditya Toshniwal Software Engineer | EnterpriseDB Software Solutions | Pune "Don't Complain about Heat, Plant a tree" --0000000000004b31c2057f7b93bd Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Hackers,

Please find the updated, rebased patch.
<= div class=3D"gmail_default" style=3D"font-family:verdana,sans-serif">Kindly= review.

On Mon,= Jan 14, 2019 at 10:54 AM Aditya Toshniwal <aditya.toshniwal@enterprisedb.com> wrote:
=
Hi Ha= ckers,

Attached is the patch for further design improvements:
- Proces= s watcher made fixed width with header changes, time details rounded to 2 d= ecimals
- Query history will show "No query history" if no query = fired. Query editor default size increased.
- Tree improvements - right bol= d border removed completely. Now click anywhere on a tree item to perform a= ctions. Please note, single click on the tiny tree arrow button will not wo= rk with this. Clicking anywhere is more useful than this.
- Fixed a bug w= here New folder create button not working when in List mode and No files/fo= lder present.
- Other minor improvements.

Kindly review.
On Mon, Jan 7, 2019 at 3:17 P= M Aditya Toshniwal <aditya.toshniwal@enterprisedb.com> wrote:
Hi Hackers,=

Attached is the patch for few more changes:
- New Folder button was n= ot working in file dialogue. Fixed that.
- Color, icon changes in file dial= ogue
- Also replaced the splash screen image (which is used on main dashboa= rd also). It works fine on dashboard. However, I'm not sure of the spla= sh screen as the new image is SVG and older was PNG. I have made changes fo= r that in runtime code but I'm not able to test (evnvironment issue) ru= ntime code :(. It would be helpful if someone else can try it once.

Ki= ndly review.


On Mon, Jan 7, 2019 at 2:25 PM Dave Page <dpage@pgadmin.org> wrote:
Thanks - applied!

On Mon, Jan 7, 2019 at 10:44 AM Aditya Toshniwal
<= aditya.toshniwal@enterprisedb.com> wrote:
>
> Hi Hackers,
>
> Attached is the patch to incorporate the changes discussed in trailing= mail(s).
>
> Kindly review.
>
> On Fri, Jan 4, 2019 at 3:31 PM Dave Page <dpage@pgadmin.org> wrote:
>>
>> On Fri, Jan 4, 2019 at 9:58 AM Aditya Toshniwal
>> <aditya.toshniwal@enterprisedb.com> wrote:
>> >
>> > Hi,
>> >
>> > On Fri, Jan 4, 2019 at 2:53 PM Dave Page <dpage@pgadmin.org> wrote:
>> >>
>> >> Hi
>> >>
>> >> On Fri, Jan 4, 2019 at 4:51 AM Aditya Toshniwal <aditya.to= shniwal@enterprisedb.com> wrote:
>> >>>
>> >>> Hi Dave,
>> >>>
>> >>> On Thu, Jan 3, 2019 at 8:39 PM Dave Page <dpage@pgadmin.org> w= rote:
>> >>>>
>> >>>>
>> >>>> A few other things that I noticed (or have been b= ugging me):
>> >>>>
>> >>>> - The menu bar seems a little cramped. Taking pg-= navbar from 32 to 40px and setting the font-weight to normal on the menu op= tions (but not the product name) seems much better to me (and adjusting eve= rything else as required of course).
>> >>>
>> >>> Giving too much space for the navbar will reduce the = usable space for other things. It is good enough(32) to be used easily, and= is equal to all the other headers in app (including tabs) giving a feel of= native desktop application. You'll find even smaller menu heights in n= ative desktop application. We can make font weight to normal and may be sli= ghtly increase horizontal spacing between the menu links.
>> >>
>> >>
>> >> 8 pixels isn't going to make a noticeable difference = to the workspace for users, and would leave the bar smaller than the 50px i= t's been for the last couple of years (iirc). I think it needs it to av= oid looking cramped - please make the change.
>> >
>> > Will do.
>> > One more doubt regarding bold headers, should I remove bold h= eaders in dashboard graph header, subnode headers (eg.table->columns), p= roperties tab accrordian headers ?
>>
>> No, please don't. I left them bold and the styling seemed like= it
>> worked. We can tweak again if others disagree later.
>>
>> Thanks!
>>
>> BTW - Chrome 71 shows the offset headers in the file dialogue as w= ell.
>>
>> >>>>
>> >>>> - In the file dialogue, the column headers don= 9;t line up with the columns in the rows.
>> >>>
>> >>> I could not see this on my machine (screenshot attach= ed). Could you please share the screenshot.
>> >>
>> >>
>> >> Attached - thanks! This is Chrome 70.0.3538.102 on MacOS.=
>> >>
>> >> --
>> >> Dave Page
>> >> Blog: http://pgsnake.blogspot.com
>> >> Twitter: @pgsnake
>> >>
>> >> EnterpriseDB UK: http://www.enterprisedb.com
>> >> The Enterprise PostgreSQL Company
>> >
>> >
>> >
>> > --
>> > Thanks and Regards,
>> > Aditya Toshniwal
>> > Software Engineer | EnterpriseDB Software Solutions | 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
> Software Engineer | EnterpriseDB Software Solutions | 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
Software Engineer |=C2=A0EnterpriseDB Software= Solutions |=C2=A0Pune
"Don't Complain about Heat, Plant = a tree"


--
Thanks and Regards,
Aditya Toshniwal
=
Software Engineer |=C2=A0E= nterpriseDB Software Solutions |=C2=A0P= une
"Don't Complai= n about Heat, Plant a tree"


--
Thanks and Rega= rds,
Aditya Toshniwa= l
Softw= are Engineer |=C2=A0EnterpriseDB Software Solutions |=C2=A0Pune
&q= uot;Don't Complain about Heat, Plant a tree"
--0000000000004b31c2057f7b93bd-- --0000000000004b31c5057f7b93bf Content-Type: application/octet-stream; name="RM3692.part6.patch" Content-Disposition: attachment; filename="RM3692.part6.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jqxjhylr0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9zY2hlbWFzL2Z1bmN0aW9ucy9zdGF0aWMvanMvZnVuY3Rpb24uanMgYi93ZWIvcGdh ZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mdW5j dGlvbnMvc3RhdGljL2pzL2Z1bmN0aW9uLmpzCmluZGV4IGU5MGFmNTcwLi42YWM3YThhNSAxMDA2 NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJh c2VzL3NjaGVtYXMvZnVuY3Rpb25zL3N0YXRpYy9qcy9mdW5jdGlvbi5qcworKysgYi93ZWIvcGdh ZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mdW5j dGlvbnMvc3RhdGljL2pzL2Z1bmN0aW9uLmpzCkBAIC0xMDgsNiArMTA4LDcgQEAgZGVmaW5lKCdw Z2FkbWluLm5vZGUuZnVuY3Rpb24nLCBbCiAgICAgICBjb2xsZWN0aW9uX3R5cGU6ICdjb2xsLWZ1 bmN0aW9uJywKICAgICAgIGhhc1NRTDogdHJ1ZSwKICAgICAgIGhhc0RlcGVuZHM6IHRydWUsCisg ICAgICB3aWR0aDogcGdCcm93c2VyLnN0ZFcubWQgKyAncHgnLAogICAgICAgaGFzU3RhdGlzdGlj czogKHRyZWVJbmZvcm1hdGlvbikgPT4gewogICAgICAgICByZXR1cm4gdHJlZUluZm9ybWF0aW9u LnNlcnZlci5zZXJ2ZXJfdHlwZSAhPT0gJ2dwZGInOwogICAgICAgfSwKZGlmZiAtLWdpdCBhL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFz L3R5cGVzL3N0YXRpYy9qcy90eXBlLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3Jv dXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdHlwZXMvc3RhdGljL2pzL3R5cGUuanMKaW5k ZXggNGNjNDgwMTIuLjY2MjNhYWZkIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3Nl cnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90eXBlcy9zdGF0aWMvanMvdHlw ZS5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvc2NoZW1hcy90eXBlcy9zdGF0aWMvanMvdHlwZS5qcwpAQCAtMzQ4LDcgKzM0OCw3IEBA IGRlZmluZSgncGdhZG1pbi5ub2RlLnR5cGUnLCBbCiAgICAgICAgICAgaWQ6ICd0eXB0eXBlJywg bGFiZWw6IGdldHRleHQoJ1R5cGUnKSwKICAgICAgICAgICBtb2RlOiBbJ2NyZWF0ZScsJ2VkaXQn XSwgZGlzYWJsZWQ6ICdpblNjaGVtYVdpdGhNb2RlbENoZWNrJywKICAgICAgICAgICBncm91cDog Z2V0dGV4dCgnRGVmaW5pdGlvbicpLAotICAgICAgICAgIHNlbGVjdDI6IHsgd2lkdGg6ICc1MCUn LCBhbGxvd0NsZWFyOiBmYWxzZSB9LAorICAgICAgICAgIHNlbGVjdDI6IHsgYWxsb3dDbGVhcjog ZmFsc2UgfSwKICAgICAgICAgICBvcHRpb25zOiBmdW5jdGlvbigpIHsKICAgICAgICAgICAgIHJl dHVybiBbCiAgICAgICAgICAgICAgIHtsYWJlbDogJ0NvbXBvc2l0ZScsIHZhbHVlOiAnYyd9LApA QCAtNTUzLDExICs1NTMsMTMgQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUudHlwZScsIFsKICAgICAg ICAgfSx7CiAgICAgICAgICAgdHlwZTogJ25lc3RlZCcsIGNvbnRyb2w6ICd0YWInLCBncm91cDog Z2V0dGV4dCgnRGVmaW5pdGlvbicpLAogICAgICAgICAgIGxhYmVsOiBnZXR0ZXh0KCdFeHRlcm5h bCBUeXBlJyksIGRlcHM6IFsndHlwdHlwZSddLAotICAgICAgICAgIG1vZGU6IFsnY3JlYXRlJywg J2VkaXQnXSwKKyAgICAgICAgICBtb2RlOiBbJ2NyZWF0ZScsICdlZGl0J10sIHRhYlBhbmVsRXh0 cmFDbGFzc2VzOidpbmxpbmUtdGFiLXBhbmVsLXBhZGRlZCcsCiAgICAgICAgICAgdmlzaWJsZTog ZnVuY3Rpb24obSkgewogICAgICAgICAgICAgcmV0dXJuIG0uZ2V0KCd0eXB0eXBlJykgPT09ICdi JzsKICAgICAgICAgICB9LAogICAgICAgICAgIHNjaGVtYTpbeworICAgICAgICAgICAgaWQ6ICdz cGFjZXJfY3RybCcsIGdyb3VwOiBnZXR0ZXh0KCdSZXF1aXJlZCcpLCBtb2RlOiBbJ2VkaXQnLCAn Y3JlYXRlJ10sIHR5cGU6ICdzcGFjZXInLAorICAgICAgICAgIH0sewogICAgICAgICAgICAgaWQ6 ICd0eXBpbnB1dCcsIGxhYmVsOiBnZXR0ZXh0KCdJbnB1dCBmdW5jdGlvbicpLAogICAgICAgICAg ICAgY2VsbDogJ3N0cmluZycsdHlwZTogJ3RleHQnLAogICAgICAgICAgICAgbW9kZTogWydwcm9w ZXJ0aWVzJywgJ2NyZWF0ZScsICdlZGl0J10sIGdyb3VwOiBnZXR0ZXh0KCdSZXF1aXJlZCcpLApA QCAtNTc0LDYgKzU3Niw4IEBAIGRlZmluZSgncGdhZG1pbi5ub2RlLnR5cGUnLCBbCiAgICAgICAg ICAgICAsY29udHJvbDogJ25vZGUtYWpheC1vcHRpb25zJywgdXJsOiAnZ2V0X2V4dGVybmFsX2Z1 bmN0aW9ucycsCiAgICAgICAgICAgICB0cmFuc2Zvcm06ICdleHRlcm5hbF9mdW5jX2NvbWJvJywK ICAgICAgICAgICAgIHNlbGVjdDI6IHsgYWxsb3dDbGVhcjogdHJ1ZSwgcGxhY2Vob2xkZXI6ICcn LCB3aWR0aDogJzEwMCUnIH0sCisgICAgICAgICAgfSx7CisgICAgICAgICAgICBpZDogJ3NwYWNl cl9jdHJsX29wdGlvbmFsXzEnLCBncm91cDogZ2V0dGV4dCgnT3B0aW9uYWwtMScpLCBtb2RlOiBb J2VkaXQnLCAnY3JlYXRlJ10sIHR5cGU6ICdzcGFjZXInLAogICAgICAgICAgIH0sewogICAgICAg ICAgICAgaWQ6ICd0eXByZWNlaXZlJywgbGFiZWw6IGdldHRleHQoJ1JlY2VpdmUgZnVuY3Rpb24n KSwKICAgICAgICAgICAgIGNlbGw6ICdzdHJpbmcnLCB0eXBlOiAndGV4dCcsIGdyb3VwOiBnZXR0 ZXh0KCdPcHRpb25hbC0xJyksCkBAIC02NzUsNiArNjc5LDggQEAgZGVmaW5lKCdwZ2FkbWluLm5v ZGUudHlwZScsIFsKICAgICAgICAgICAgIHR5cGU6ICdzd2l0Y2gnLCBtb2RlOiBbJ3Byb3BlcnRp ZXMnLCAnY3JlYXRlJywnZWRpdCddLAogICAgICAgICAgICAgZGlzYWJsZWQ6ICdpblNjaGVtYVdp dGhNb2RlbENoZWNrJywKICAgICAgICAgICAgIGdyb3VwOiBnZXR0ZXh0KCdPcHRpb25hbC0xJyks CisgICAgICAgICAgfSx7CisgICAgICAgICAgICBpZDogJ3NwYWNlcl9jdHJsX29wdGlvbmFsXzIn LCBncm91cDogZ2V0dGV4dCgnT3B0aW9uYWwtMicpLCBtb2RlOiBbJ2VkaXQnLCAnY3JlYXRlJ10s IHR5cGU6ICdzcGFjZXInLAogICAgICAgICAgIH0sewogICAgICAgICAgICAgaWQ6ICdlbGVtZW50 JywgbGFiZWw6IGdldHRleHQoJ0VsZW1lbnQgdHlwZScpLCBjZWxsOiAnc3RyaW5nJywKICAgICAg ICAgICAgIGNvbnRyb2w6ICdub2RlLWFqYXgtb3B0aW9ucycsIGdyb3VwOiBnZXR0ZXh0KCdPcHRp b25hbC0yJyksCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9jc3Mvd2l6 YXJkLmNzcyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2Nzcy93aXphcmQuY3NzCmluZGV4 IDI5NjQxYmMxLi5hNGE3ZDczZiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0 aWMvY3NzL3dpemFyZC5jc3MKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvY3NzL3dp emFyZC5jc3MKQEAgLTEsNyArMSw0IEBACiAvKiogQ1NTIGZvciBXaXphcmQgKiovCi0ucGdhZG1p bl9ncmFudF93aXphcmRfYm9keSAuYWpzLWNvbnRlbnQgewotICBwYWRkaW5nOiAwcHggIWltcG9y dGFudDsKLX0KIAogLndpemFyZC1oZWFkZXIgaDMgewogICBmb250LXNpemU6IDE0cHg7CmRpZmYg LS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3RlbXBsYXRlcy9icm93c2VyL2luZGV4Lmh0bWwg Yi93ZWIvcGdhZG1pbi9icm93c2VyL3RlbXBsYXRlcy9icm93c2VyL2luZGV4Lmh0bWwKaW5kZXgg ODk4NzdmNTkuLjk2NWFlNWNlIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3RlbXBs YXRlcy9icm93c2VyL2luZGV4Lmh0bWwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci90ZW1wbGF0 ZXMvYnJvd3Nlci9pbmRleC5odG1sCkBAIC05Niw3ICs5Niw3IEBAIHdpbmRvdy5vbmxvYWQgPSBm dW5jdGlvbihlKXsKICAgICA8ZGl2IGNsYXNzPSJyb3ciPjxkaXYgY2xhc3M9ImNvbC0xMiBwZy1z cC10ZXh0Ij57eyBfKCdMb2FkaW5nIHswfSB2ezF9Li4uJykuZm9ybWF0KGNvbmZpZy5BUFBfTkFN RSwgY29uZmlnLkFQUF9WRVJTSU9OKSB9fTwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIDwvZGl2Pgot PG5hdiBjbGFzcz0ibmF2YmFyIGZpeGVkLXRvcCBuYXZiYXItZXhwYW5kLWxnIG5hdmJhci1kYXJr IGJnLXByaW1hcnkgcGctbmF2YmFyIj4KKzxuYXYgY2xhc3M9Im5hdmJhciBmaXhlZC10b3AgbmF2 YmFyLWV4cGFuZC1sZyBuYXZiYXItZGFyayBwZy1uYXZiYXIiPgogICAgIDxhIGNsYXNzPSJuYXZi YXItYnJhbmQgcGdhZG1pbl9oZWFkZXJfbG9nbyIgb25DbGljaz0icmV0dXJuIGZhbHNlOyIgaHJl Zj0ie3sgJyMnIH19IgogICAgICAgIHRpdGxlPSJ7eyBjb25maWcuQVBQX05BTUUgfX0ge3sgXygn bG9nbycpIH19Ij4KICAgICAgICAgPGkgY2xhc3M9ImFwcC1pY29uIHt7IGNvbmZpZy5BUFBfSUNP TiB9fSI+PC9pPgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vbWlzYy9iZ3Byb2Nlc3MvcHJvY2Vz c2VzLnB5IGIvd2ViL3BnYWRtaW4vbWlzYy9iZ3Byb2Nlc3MvcHJvY2Vzc2VzLnB5CmluZGV4IDhm MDBhNGY3Li4xOTk2YmZhOCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vbWlzYy9iZ3Byb2Nlc3Mv cHJvY2Vzc2VzLnB5CisrKyBiL3dlYi9wZ2FkbWluL21pc2MvYmdwcm9jZXNzL3Byb2Nlc3Nlcy5w eQpAQCAtNjA2LDExICs2MDYsMTMgQEAgY2xhc3MgQmF0Y2hQcm9jZXNzKG9iamVjdCk6CiAgICAg ICAgICAgICAgICAgZm9yIGFyZyBpbiBhcmdzX3JlYWRlcjoKICAgICAgICAgICAgICAgICAgICAg YXJncyA9IGFyZ3MgKyBhcmcKICAgICAgICAgICAgICAgICBkZXRhaWxzID0gZGVzYy5kZXRhaWxz KHAuY29tbWFuZCwgYXJncykKKyAgICAgICAgICAgICAgICB0eXBlX2Rlc2MgPSBkZXNjLnR5cGVf ZGVzYwogICAgICAgICAgICAgICAgIGRlc2MgPSBkZXNjLm1lc3NhZ2UKIAogICAgICAgICAgICAg cmVzLmFwcGVuZCh7CiAgICAgICAgICAgICAgICAgJ2lkJzogcC5waWQsCiAgICAgICAgICAgICAg ICAgJ2Rlc2MnOiBkZXNjLAorICAgICAgICAgICAgICAgICd0eXBlX2Rlc2MnOiB0eXBlX2Rlc2Ms CiAgICAgICAgICAgICAgICAgJ2RldGFpbHMnOiBkZXRhaWxzLAogICAgICAgICAgICAgICAgICdz dGltZSc6IHN0aW1lLAogICAgICAgICAgICAgICAgICdldGltZSc6IHAuZW5kX3RpbWUsCkBAIC02 MjcsMTMgKzYyOSw3IEBAIGNsYXNzIEJhdGNoUHJvY2VzcyhvYmplY3QpOgogCiAgICAgQHN0YXRp Y21ldGhvZAogICAgIGRlZiB0b3RhbF9zZWNvbmRzKGR0KToKLSAgICAgICAgIyBLZWVwIGJhY2t3 YXJkIGNvbXBhdGliaWxpdHkgd2l0aCBQeXRob24gMi42IHdoaWNoIGRvZXNuJ3QgaGF2ZQotICAg ICAgICAjIHRoaXMgbWV0aG9kCi0gICAgICAgIGlmIGhhc2F0dHIoZHQsICd0b3RhbF9zZWNvbmRz Jyk6Ci0gICAgICAgICAgICByZXR1cm4gZHQudG90YWxfc2Vjb25kcygpCi0gICAgICAgIGVsc2U6 Ci0gICAgICAgICAgICByZXR1cm4gKGR0Lm1pY3Jvc2Vjb25kcyArIChkdC5zZWNvbmRzICsgZHQu ZGF5cyAqIDI0ICogMzYwMCkgKgotICAgICAgICAgICAgICAgICAgICAxMCoqNikgLyAxMCoqNgor ICAgICAgICByZXR1cm4gcm91bmQoZHQudG90YWxfc2Vjb25kcygpLCAyKQogCiAgICAgQHN0YXRp Y21ldGhvZAogICAgIGRlZiBhY2tub3dsZWRnZShfcGlkKToKZGlmZiAtLWdpdCBhL3dlYi9wZ2Fk bWluL21pc2MvYmdwcm9jZXNzL3N0YXRpYy9qcy9iZ3Byb2Nlc3MuanMgYi93ZWIvcGdhZG1pbi9t aXNjL2JncHJvY2Vzcy9zdGF0aWMvanMvYmdwcm9jZXNzLmpzCmluZGV4IGM1YWQ1ZWI4Li41YTU0 NDZhZCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vbWlzYy9iZ3Byb2Nlc3Mvc3RhdGljL2pzL2Jn cHJvY2Vzcy5qcworKysgYi93ZWIvcGdhZG1pbi9taXNjL2JncHJvY2Vzcy9zdGF0aWMvanMvYmdw cm9jZXNzLmpzCkBAIC00MSw3ICs0MSw3IEBAIGRlZmluZSgnbWlzYy5iZ3Byb2Nlc3MnLCBbCiAg ICAgICAgIDxkaXYgY2xhc3M9InRleHQtYm9keSBteC1hdXRvIHBnLWJnLXN0YXR1cy10ZXh0Ij48 JS1zdGF0dXNfdGV4dCU+PC9kaXY+CiAgICAgICA8L2Rpdj5gKSwKICAgICAgIGZhaWxlZF9zdGF0 dXNfdHBsOiBfLnRlbXBsYXRlKGAKLSAgICAgIDxkaXYgY2xhc3M9ImQtZmxleCBweC0yIHB5LTEg YmctZGFuZ2VyLWxpZ2h0IGJvcmRlciBib3JkZXItZGFuZ2VyIHJvdW5kZWQiPgorICAgICAgPGRp diBjbGFzcz0iZC1mbGV4IHB4LTIgcHktMSBiZy1kYW5nZXItbGlnaHRlciBib3JkZXIgYm9yZGVy LWRhbmdlciByb3VuZGVkIj4KICAgICAgICAgPGRpdiBjbGFzcz0icHItMiI+CiAgICAgICAgICAg PGkgY2xhc3M9ImZhIGZhLWNsb3NlIGZhLWxnIHRleHQtZGFuZ2VyIHBnLWJnLXN0YXR1cy1pY29u IiBhcmlhLWhpZGRlbj0idHJ1ZSI+PC9pPgogICAgICAgICA8L2Rpdj4KQEAgLTYzLDYgKzYzLDcg QEAgZGVmaW5lKCdtaXNjLmJncHJvY2VzcycsIFsKICAgICAgICAgICBjb21wbGV0ZWQ6IGZhbHNl LAogCiAgICAgICAgICAgaWQ6IGluZm9bJ2lkJ10sCisgICAgICAgICAgdHlwZV9kZXNjOiBudWxs LAogICAgICAgICAgIGRlc2M6IG51bGwsCiAgICAgICAgICAgZGV0YWlsZWRfZGVzYzogbnVsbCwK ICAgICAgICAgICBzdGltZTogbnVsbCwKQEAgLTE0NSw2ICsxNDYsOSBAQCBkZWZpbmUoJ21pc2Mu Ymdwcm9jZXNzJywgWwogICAgICAgICBpZiAoJ2V4ZWN1dGlvbl90aW1lJyBpbiBkYXRhKQogICAg ICAgICAgIHNlbGYuZXhlY3V0aW9uX3RpbWUgPSBwYXJzZUZsb2F0KGRhdGEuZXhlY3V0aW9uX3Rp bWUpOwogCisgICAgICAgIGlmICgndHlwZV9kZXNjJyBpbiBkYXRhKQorICAgICAgICAgIHNlbGYu dHlwZV9kZXNjID0gZGF0YS50eXBlX2Rlc2M7CisKICAgICAgICAgaWYgKCdkZXNjJyBpbiBkYXRh KQogICAgICAgICAgIHNlbGYuZGVzYyA9IGRhdGEuZGVzYzsKIApAQCAtMjg4LDEyICsyOTIsMTMg QEAgZGVmaW5lKCdtaXNjLmJncHJvY2VzcycsIFsKICAgICAgICAgICAgIGxldCBjb250ZW50ID0g JChgCiAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJjYXJkIj4KICAgICAgICAgICAgICAgPGRpdiBj bGFzcz0iY2FyZC1oZWFkZXIgYmctcHJpbWFyeSBkLWZsZXgiPgotICAgICAgICAgICAgICAgIDxk aXY+JHtfLnVuZXNjYXBlKHNlbGYuZGVzYyl9PC9kaXY+CisgICAgICAgICAgICAgICAgPGRpdj4k e18uZXNjYXBlKHNlbGYudHlwZV9kZXNjKX08L2Rpdj4KICAgICAgICAgICAgICAgICA8ZGl2IGNs YXNzPSJtbC1hdXRvIj4KICAgICAgICAgICAgICAgICAgIDxidXR0b24gY2xhc3M9ImJ0biBidG4t c20tc3EgYnRuLXByaW1hcnkgcGctYmctY2xvc2UiPjxpIGNsYXNzPSJmYSBmYS1sZyBmYS1jbG9z ZSI+PC9pPjwvYnV0dG9uPgogICAgICAgICAgICAgICAgIDwvZGl2PgogICAgICAgICAgICAgICA8 L2Rpdj4KICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0iY2FyZC1ib2R5IHB4LTIiPgorICAgICAg ICAgICAgICAgIDxkaXYgY2xhc3M9InB5LTEiPiR7Xy51bmVzY2FwZShzZWxmLmRlc2MpfTwvZGl2 PgogICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9InB5LTEiPiR7c2VsZi5zdGltZS50b1N0cmlu ZygpfTwvZGl2PgogICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImQtZmxleCBweS0xIj4KICAg ICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9Im15LWF1dG8gbXItMiI+CkBAIC0zODQsNyArMzg5 LDcgQEAgZGVmaW5lKCdtaXNjLmJncHJvY2VzcycsIFsKICAgICAgICAgICBwYW5lbCA9IHRoaXMu cGFuZWwgPQogICAgICAgICAgICAgcGdCcm93c2VyLkJhY2tncm91bmRQcm9jZXNzT2Jzb3J2ZXIu Y3JlYXRlX3BhbmVsKCk7CiAKLSAgICAgICAgICBwYW5lbC50aXRsZSgnUHJvY2VzcyBXYXRjaGVy IC0gJyArIF8uZXNjYXBlKHNlbGYuZGVzYykpOworICAgICAgICAgIHBhbmVsLnRpdGxlKCdQcm9j ZXNzIFdhdGNoZXIgLSAnICsgXy5lc2NhcGUoc2VsZi50eXBlX2Rlc2MpKTsKICAgICAgICAgICBw YW5lbC5mb2N1cygpOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2Mv Ymdwcm9jZXNzL3N0YXRpYy9zY3NzL19iZ3Byb2Nlc3Muc2NzcyBiL3dlYi9wZ2FkbWluL21pc2Mv Ymdwcm9jZXNzL3N0YXRpYy9zY3NzL19iZ3Byb2Nlc3Muc2NzcwppbmRleCBjYWY1NGYyMy4uNzgy MTg1M2UgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL21pc2MvYmdwcm9jZXNzL3N0YXRpYy9zY3Nz L19iZ3Byb2Nlc3Muc2NzcworKysgYi93ZWIvcGdhZG1pbi9taXNjL2JncHJvY2Vzcy9zdGF0aWMv c2Nzcy9fYmdwcm9jZXNzLnNjc3MKQEAgLTYsNiArNiw4IEBAICRiZ3Byb2MtY29udGFpbmVyLXBh ZDogMnB4OwogICBwYWRkaW5nOiAwcHggIWltcG9ydGFudDsKICAgdGV4dC1hbGlnbjogbGVmdDsK ICAgY29sb3I6ICRjb2xvci1mZy10aGVtZTsKKyAgbWluLXdpZHRoOiA1MDBweDsKKyAgbWF4LXdp ZHRoOiA1MDBweDsKICAgLmNhcmQgewogICAgIGJvcmRlcjpub25lOwogICAgICYgLmNhcmQtaGVh ZGVyIHsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3N0YXRpYy9q cy91dGlsaXR5LmpzIGIvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvc3RhdGljL2pzL3V0 aWxpdHkuanMKaW5kZXggMjQ2NmIxNDguLmM3MTRmMTU0IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1p bi9taXNjL2ZpbGVfbWFuYWdlci9zdGF0aWMvanMvdXRpbGl0eS5qcworKysgYi93ZWIvcGdhZG1p bi9taXNjL2ZpbGVfbWFuYWdlci9zdGF0aWMvanMvdXRpbGl0eS5qcwpAQCAtNjcwLDEyICs2NzAs MTUgQEAgZGVmaW5lKFsKICAgICAgICAgaWYgKCQoJy5maWxlaW5mbycpLmRhdGEoJ3ZpZXcnKSA9 PSAnZ3JpZCcpIHsKICAgICAgICAgICByZXN1bHQgKz0gJzx1bCBpZD0iY29udGVudHMiIGNsYXNz PSJncmlkIj48L3VsPic7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgcmVzdWx0ICs9ICc8 dGFibGUgaWQ9ImNvbnRlbnRzIiBjbGFzcz0idGFibGUgdGFibGUtYm9yZGVyZWQgdGFibGUtbm9v dXRlci1ib3JkZXIgdGFibGUtZW1wdHktcm93cyBhYmxlc29ydGVyIj4nOworICAgICAgICAgIC8q IGZpbGVfbGlzdGluZ190YWJsZSBjbGFzcyBtYWtlcyBoZWlnaHQgMTAwJSwgYmVjYXVzZSBvZiB3 aGljaCBObyBmb2xkZXIgbWVzc2FnZSBpcyBub3QgZGlzcGxheWVkCisgICAgICAgICAgICogZmls ZV9saXN0aW5nX3RhYmxlX25vX2RhdGEgd2lsbCBiZSByZW1vdmVkIHdoZW4gbmV3IGZvbGRlciBp cyBjcmVhdGVkCisgICAgICAgICAgICovCisgICAgICAgICAgcmVzdWx0ICs9ICc8dGFibGUgaWQ9 ImNvbnRlbnRzIiBjbGFzcz0idGFibGUgdGFibGUtYm9yZGVyZWQgdGFibGUtbm9vdXRlci1ib3Jk ZXIgdGFibGUtYm90dG9tLWJvcmRlciB0YWJsZS1ob3ZlciB0YWJsZXNvcnRlciBmaWxlX2xpc3Rp bmdfdGFibGUgZmlsZV9saXN0aW5nX3RhYmxlX25vX2RhdGEiPic7CiAgICAgICAgICAgcmVzdWx0 ICs9ICc8dGhlYWQ+PHRyPjx0aD48c3Bhbj4nICsgbGcubmFtZSArICc8L3NwYW4+PC90aD4nICsK ICAgICAgICAgICAgICAgICAgICAgJzx0aD48c3Bhbj4nICsgbGcuc2l6ZSArICc8L3NwYW4+PC90 aD4nICsKICAgICAgICAgICAgICAgICAgICAgJzx0aD48c3Bhbj4nICsgbGcubW9kaWZpZWQgKyAn PC9zcGFuPjwvdGg+JyArCi0gICAgICAgICAgICAgICAgICAgICc8L3RyPjwvdGhlYWQ+JzsKLSAg ICAgICAgICByZXN1bHQgKz0gJzwvdGJvZHk+JzsKKyAgICAgICAgICAgICAgICAgICAgJzwvdHI+ PC90aGVhZD4nICsKKyAgICAgICAgICAgICAgICAgICAgJzx0Ym9keT48L3Rib2R5Pic7CiAgICAg ICAgICAgcmVzdWx0ICs9ICc8L3RhYmxlPic7CiAgICAgICAgIH0KICAgICAgICAgcmVzdWx0ICs9 ICc8ZGl2IGNsYXNzPSJub19mb2xkZXJfZm91bmQiPicgKyBsZy5jb3VsZF9ub3RfcmV0cmlldmVf Zm9sZGVyICsgJzwvZGl2Pic7CkBAIC0xNTc2LDYgKzE1NzksNyBAQCBkZWZpbmUoWwogCiAKICAg ICAgICAgJCgnLmZpbGVfbWFuYWdlciBidXR0b24uY3JlYXRlJykuYXR0cignZGlzYWJsZWQnLCAn ZGlzYWJsZWQnKTsKKyAgICAgICAgJCgnLm5vX2ZvbGRlcl9mb3VuZCcpLmFkZENsYXNzKCdkLW5v bmUnKTsKICAgICAgICAgaWYgKCQoJy5maWxlaW5mbycpLmRhdGEoJ3ZpZXcnKSA9PSAnZ3JpZCcp IHsKIAogICAgICAgICAgIC8vIHRlbXBsYXRlIGZvciBjcmVhdGluZyBuZXcgZm9sZGVyCkBAIC0x NjMwLDcgKzE2MzQsMTAgQEAgZGVmaW5lKFsKICAgICAgICAgICApOwogCiAgICAgICAgICAgJGZp bGVfZWxlbWVudF9saXN0ID0gJChmb2xkZXJfZGl2KTsKLSAgICAgICAgICAkKCcuZmlsZWluZm8g I2NvbnRlbnRzLmZpbGVfbGlzdGluZ190YWJsZSB0Ym9keScpLnByZXBlbmQoJGZpbGVfZWxlbWVu dF9saXN0KTsKKyAgICAgICAgICBsZXQgdGFibGVFbCA9ICQoJy5maWxlaW5mbyAjY29udGVudHMu ZmlsZV9saXN0aW5nX3RhYmxlJyk7CisgICAgICAgICAgdGFibGVFbC5yZW1vdmVDbGFzcygnZmls ZV9saXN0aW5nX3RhYmxlX25vX2RhdGEnKTsKKyAgICAgICAgICB0YWJsZUVsLmZpbmQoJ3Rib2R5 JykucHJlcGVuZCgkZmlsZV9lbGVtZW50X2xpc3QpOworCiAgICAgICAgICAgJGZpbGVfZWxlbWVu dF9saXN0LmZpbmQoJ3RkIHNwYW4ubGVzc190ZXh0JykudG9nZ2xlKCk7CiAgICAgICAgICAgJGZp bGVfZWxlbWVudF9saXN0LmZpbmQoJ3RkIGlucHV0JykudG9nZ2xlKCkudmFsKGxnLm5ld19mb2xk ZXIpLnNlbGVjdCgpOwogCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdl ci9zdGF0aWMvc2Nzcy9fZmlsZV9tYW5hZ2VyLnNjc3MgYi93ZWIvcGdhZG1pbi9taXNjL2ZpbGVf bWFuYWdlci9zdGF0aWMvc2Nzcy9fZmlsZV9tYW5hZ2VyLnNjc3MKaW5kZXggM2E3N2JmYTEuLmFi NDhmZjk4IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdlci9zdGF0aWMv c2Nzcy9fZmlsZV9tYW5hZ2VyLnNjc3MKKysrIGIvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFn ZXIvc3RhdGljL3Njc3MvX2ZpbGVfbWFuYWdlci5zY3NzCkBAIC02LDYgKzYsMTAgQEAKIC5maWxl X2xpc3RpbmcgewogICBtaW4td2lkdGg6IDEwMCU7CiAKKyAgLmZpbGVfbGlzdGluZ190YWJsZV9u b19kYXRhIHsKKyAgICBoZWlnaHQ6IHVuc2V0ICFpbXBvcnRhbnQ7CisgIH0KKwogICAuZmlsZV9s aXN0aW5nX3RhYmxlIHsKICAgICBoZWlnaHQ6IDEwMCU7CiAgICAgZGlzcGxheTogYmxvY2s7CmRp ZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9wcmVmZXJlbmNlcy9zdGF0aWMvanMvcHJlZmVyZW5jZXMu anMgYi93ZWIvcGdhZG1pbi9wcmVmZXJlbmNlcy9zdGF0aWMvanMvcHJlZmVyZW5jZXMuanMKaW5k ZXggMzNiN2U3NDcuLmMzMzg1ZmFjIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9wcmVmZXJlbmNl cy9zdGF0aWMvanMvcHJlZmVyZW5jZXMuanMKKysrIGIvd2ViL3BnYWRtaW4vcHJlZmVyZW5jZXMv c3RhdGljL2pzL3ByZWZlcmVuY2VzLmpzCkBAIC0zMjksNiArMzI5LDE3IEBAIGRlZmluZSgncGdh ZG1pbi5wcmVmZXJlbmNlcycsIFsKICAgICAgICAgICAgICAgaWYgKCFkKQogICAgICAgICAgICAg ICAgIHJldHVybiB0cnVlOwogCisgICAgICAgICAgICAgIC8qIEJpbmQgZXZlbnRzIHRvIGVuYWJs ZSBjbGlja2luZyBhbnl3aGVyZSBhbmQgbm90IG9ubHkgdGV4dCwgYnV0dG9uICovCisgICAgICAg ICAgICAgIGl0ZW0ub24oJ2RibGNsaWNrJywgZnVuY3Rpb24oZSkgeworICAgICAgICAgICAgICAg IGUucHJldmVudERlZmF1bHQoKTsKKyAgICAgICAgICAgICAgICBlLnN0b3BQcm9wYWdhdGlvbigp OworICAgICAgICAgICAgICAgIGFwaS50b2dnbGUoaXRlbSk7CisgICAgICAgICAgICAgIH0pOwor ICAgICAgICAgICAgICBpdGVtLm9uKCdjbGljaycsIGZ1bmN0aW9uKGUpIHsKKyAgICAgICAgICAg ICAgICBlLnByZXZlbnREZWZhdWx0KCk7CisgICAgICAgICAgICAgICAgZS5zdG9wUHJvcGFnYXRp b24oKTsKKyAgICAgICAgICAgICAgICBhcGkuc2VsZWN0KGl0ZW0pOworICAgICAgICAgICAgICB9 KTsKICAgICAgICAgICAgICAgICAvLyBXZSB3aWxsIGFkZCB0aGUgcHJlZmVyZW5jZXMgaW4gdG8g dGhlIHByZWZlcmVuY2VzIGRhdGEKICAgICAgICAgICAgICAgICAvLyBjb2xsZWN0aW9uLgogICAg ICAgICAgICAgICBpZiAoZC5wcmVmZXJlbmNlcyAmJiBfLmlzQXJyYXkoZC5wcmVmZXJlbmNlcykp IHsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9iYWNrZm9ybS5wZ2FkbWluLmpz IGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2JhY2tmb3JtLnBnYWRtaW4uanMKaW5kZXggMjQ2YjMw YjcuLjdkYTcyMWE5IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvYmFja2Zvcm0u cGdhZG1pbi5qcworKysgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvYmFja2Zvcm0ucGdhZG1pbi5q cwpAQCAtMjExMiwxMSArMjExMiwxNiBAQCBkZWZpbmUoWwogICAgIHRhZ05hbWU6ICdkaXYnLAog ICAgIGNsYXNzTmFtZTogJ2lubGluZS10YWItcGFuZWwnLAogICAgIHRhYlBhbmVsQ2xhc3NOYW1l OiAnaW5saW5lLXRhYi1wYW5lbCcsCisgICAgdGFiUGFuZWxFeHRyYUNsYXNzZXM6ICcnLAogICAg IGluaXRpYWxpemU6IGZ1bmN0aW9uKG9wdHMpIHsKICAgICAgIEJhY2tmb3JtLkZpZWxkc2V0Q29u dHJvbC5wcm90b3R5cGUuaW5pdGlhbGl6ZS5hcHBseSgKICAgICAgICAgdGhpcywgYXJndW1lbnRz CiAgICAgICApOwogICAgICAgdGhpcy50YWJJbmRleCA9IChvcHRzLnRhYkluZGV4IHx8IHBhcnNl SW50KE1hdGgucmFuZG9tKCkgKiAxMDAwKSkgKyAxOworICAgICAgaWYob3B0cy5maWVsZC5nZXQo J3RhYlBhbmVsRXh0cmFDbGFzc2VzJykpIHsKKyAgICAgICAgdGhpcy50YWJQYW5lbEV4dHJhQ2xh c3NlcyA9IG9wdHMuZmllbGQuZ2V0KCd0YWJQYW5lbEV4dHJhQ2xhc3NlcycpOworICAgICAgfQor ICAgICAgdGhpcy50YWJQYW5lbENsYXNzTmFtZSA9IHRoaXMudGFiUGFuZWxDbGFzc05hbWUgKyAn ICcgKyB0aGlzLnRhYlBhbmVsRXh0cmFDbGFzc2VzOwogICAgIH0sCiAgICAgLy8gUmVuZGVyIHVz aW5nIEJhY2tmb3JtLkRpYWxvZyAodGFidWxhciBVSSkgKG9ubHkgaWYgdGhpcyBjb250cm9sIGlz CiAgICAgLy8gdmlzaWJsZSkuCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvdHJl ZS90cmVlLmpzIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3RyZWUvdHJlZS5qcwppbmRleCA3ODJm NGQ1OS4uMDlkMjM4YmEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy90cmVlL3Ry ZWUuanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3RyZWUvdHJlZS5qcwpAQCAtMTI0LDEw ICsxMjQsMjkgQEAgZXhwb3J0IGNsYXNzIFRyZWUgewogICAgIHJldHVybiB0aGlzLmFjaVRyZWVB cGkuc2VsZWN0ZWQoKTsKICAgfQogCisgIHRvZ2dsZU5vZGUoYWNpVHJlZUlkZW50aWZpZXIpIHsK KyAgICB0aGlzLmFjaVRyZWVBcGkudG9nZ2xlKGFjaVRyZWVJZGVudGlmaWVyKTsKKyAgfQorCiAg IHNlbGVjdE5vZGUoYWNpVHJlZUlkZW50aWZpZXIpIHsKICAgICB0aGlzLmFjaVRyZWVBcGkuc2Vs ZWN0KGFjaVRyZWVJZGVudGlmaWVyKTsKICAgfQogCisgIGJpbmRDbGlja0V2ZW50cyhhY2lUcmVl SWRlbnRpZmllcikgeworICAgIC8qIEJpbmQgZXZlbnRzIHRvIGVuYWJsZSBjbGlja2luZyBhbnl3 aGVyZSBhbmQgbm90IG9ubHkgdGV4dCwgYnV0dG9uICovCisgICAgYWNpVHJlZUlkZW50aWZpZXIu b2ZmKCdkYmxjbGljaycpLm9uKCdkYmxjbGljaycsIGZ1bmN0aW9uKGUpIHsKKyAgICAgIGUucHJl dmVudERlZmF1bHQoKTsKKyAgICAgIGUuc3RvcFByb3BhZ2F0aW9uKCk7CisgICAgICB0aGlzLnRv Z2dsZU5vZGUoYWNpVHJlZUlkZW50aWZpZXIpOworICAgIH0uYmluZCh0aGlzKSk7CisKKyAgICBh Y2lUcmVlSWRlbnRpZmllci5vZmYoJ2NsaWNrJykub24oJ2NsaWNrJywgZnVuY3Rpb24oZSkgewor ICAgICAgZS5wcmV2ZW50RGVmYXVsdCgpOworICAgICAgZS5zdG9wUHJvcGFnYXRpb24oKTsKKyAg ICAgIHRoaXMuc2VsZWN0Tm9kZShhY2lUcmVlSWRlbnRpZmllcik7CisgICAgfS5iaW5kKHRoaXMp KTsKKyAgfQorCiAgIGNyZWF0ZU9yVXBkYXRlTm9kZShpZCwgZGF0YSwgcGFyZW50LCBkb21Ob2Rl KSB7CiAgICAgbGV0IG9sZE5vZGVQYXRoID0gW2lkXTsKICAgICBpZihwYXJlbnQgIT09IG51bGwg JiYgcGFyZW50ICE9PSB1bmRlZmluZWQpIHsKQEAgLTE0MCw2ICsxNTksOCBAQCBleHBvcnQgY2xh c3MgVHJlZSB7CiAgICAgfQogCiAgICAgY29uc3Qgbm9kZSA9IG5ldyBUcmVlTm9kZShpZCwgZGF0 YSwgZG9tTm9kZSwgcGFyZW50KTsKKyAgICB0aGlzLmJpbmRDbGlja0V2ZW50cyhkb21Ob2RlKTsK KwogICAgIGlmIChwYXJlbnQgPT09IHRoaXMucm9vdE5vZGUpIHsKICAgICAgIG5vZGUucGFyZW50 Tm9kZSA9IG51bGw7CiAgICAgfQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzeC9o aXN0b3J5L3F1ZXJ5X2hpc3RvcnkuanN4IGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzeC9oaXN0b3J5 L3F1ZXJ5X2hpc3RvcnkuanN4CmluZGV4IGIyNDYzOWJiLi5jZGJmN2FlMiAxMDA2NDQKLS0tIGEv d2ViL3BnYWRtaW4vc3RhdGljL2pzeC9oaXN0b3J5L3F1ZXJ5X2hpc3RvcnkuanN4CisrKyBiL3dl Yi9wZ2FkbWluL3N0YXRpYy9qc3gvaGlzdG9yeS9xdWVyeV9oaXN0b3J5LmpzeApAQCAtMTMsNiAr MTMsNyBAQCBpbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnOwogaW1wb3J0IFJlYWN0RE9NIGZyb20g J3JlYWN0LWRvbSc7CiBpbXBvcnQgU3BsaXRQYW5lIGZyb20gJ3JlYWN0LXNwbGl0LXBhbmUnOwog aW1wb3J0IF8gZnJvbSAndW5kZXJzY29yZSc7CitpbXBvcnQgZ2V0dGV4dCBmcm9tICdzb3VyY2Vz L2dldHRleHQnOwogCiBpbXBvcnQgUXVlcnlIaXN0b3J5RGV0YWlsIGZyb20gJy4vcXVlcnlfaGlz dG9yeV9kZXRhaWwnOwogaW1wb3J0IFF1ZXJ5SGlzdG9yeUVudHJpZXMgZnJvbSAnLi9xdWVyeV9o aXN0b3J5X2VudHJpZXMnOwpAQCAtOTAsMTcgKzkxLDIzIEBAIGV4cG9ydCBkZWZhdWx0IGNsYXNz IFF1ZXJ5SGlzdG9yeSBleHRlbmRzIFJlYWN0LkNvbXBvbmVudCB7CiAgIH0KIAogICByZW5kZXIo KSB7Ci0gICAgcmV0dXJuICgKLSAgICAgIDxTcGxpdFBhbmUgZGVmYXVsdFNpemU9JzUwJScgc3Bs aXQ9J3ZlcnRpY2FsJyBwYW5lMVN0eWxlPXtxdWVyeUVudHJ5TGlzdERpdlN0eWxlfQotICAgICAg ICBwYW5lMlN0eWxlPXtxdWVyeURldGFpbERpdlN0eWxlfT4KLSAgICAgICAgPFF1ZXJ5SGlzdG9y eUVudHJpZXMgaGlzdG9yeUVudHJpZXM9e3RoaXMuc3RhdGUuaGlzdG9yeX0KLSAgICAgICAgICBz ZWxlY3RlZEVudHJ5PXt0aGlzLnN0YXRlLnNlbGVjdGVkRW50cnl9Ci0gICAgICAgICAgb25TZWxl Y3RFbnRyeT17dGhpcy5zZWxlY3RIaXN0b3J5RW50cnl9Ci0gICAgICAgIC8+Ci0gICAgICAgIDxR dWVyeUhpc3RvcnlEZXRhaWwgaGlzdG9yeUVudHJ5PXt0aGlzLnN0YXRlLmN1cnJlbnRIaXN0b3J5 RGV0YWlsfQotICAgICAgICAgICAgc3FsRWRpdG9yUHJlZj17dGhpcy5wcm9wcy5zcWxFZGl0b3JQ cmVmfQotICAgICAgICAvPgotICAgICAgPC9TcGxpdFBhbmU+KTsKKyAgICBpZih0aGlzLnN0YXRl Lmhpc3RvcnkubGVuZ3RoID09IDApIHsKKyAgICAgIHJldHVybigKKyAgICAgICAgPGRpdiBjbGFz c05hbWU9ImFsZXJ0IGFsZXJ0LWluZm8gcGctcGFuZWwtbWVzc2FnZSI+e2dldHRleHQoJ05vIGhp c3RvcnkgZm91bmQnKX08L2Rpdj4KKyAgICAgICk7CisgICAgfSBlbHNlIHsKKyAgICAgIHJldHVy biAoCisgICAgICAgIDxTcGxpdFBhbmUgZGVmYXVsdFNpemU9JzUwJScgc3BsaXQ9J3ZlcnRpY2Fs JyBwYW5lMVN0eWxlPXtxdWVyeUVudHJ5TGlzdERpdlN0eWxlfQorICAgICAgICAgIHBhbmUyU3R5 bGU9e3F1ZXJ5RGV0YWlsRGl2U3R5bGV9PgorICAgICAgICAgIDxRdWVyeUhpc3RvcnlFbnRyaWVz IGhpc3RvcnlFbnRyaWVzPXt0aGlzLnN0YXRlLmhpc3Rvcnl9CisgICAgICAgICAgICBzZWxlY3Rl ZEVudHJ5PXt0aGlzLnN0YXRlLnNlbGVjdGVkRW50cnl9CisgICAgICAgICAgICBvblNlbGVjdEVu dHJ5PXt0aGlzLnNlbGVjdEhpc3RvcnlFbnRyeX0KKyAgICAgICAgICAvPgorICAgICAgICAgIDxR dWVyeUhpc3RvcnlEZXRhaWwgaGlzdG9yeUVudHJ5PXt0aGlzLnN0YXRlLmN1cnJlbnRIaXN0b3J5 RGV0YWlsfQorICAgICAgICAgICAgICBzcWxFZGl0b3JQcmVmPXt0aGlzLnByb3BzLnNxbEVkaXRv clByZWZ9CisgICAgICAgICAgLz4KKyAgICAgICAgPC9TcGxpdFBhbmU+KTsKKyAgICB9CiAgIH0K IH0KIApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX2FjaV90cmVlLm92ZXJy aWRlcy5zY3NzIGIvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX2FjaV90cmVlLm92ZXJyaWRlcy5z Y3NzCmluZGV4IDcwYTBjOTE2Li5jNDNhZWY5NiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vc3Rh dGljL3Njc3MvX2FjaV90cmVlLm92ZXJyaWRlcy5zY3NzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRp Yy9zY3NzL19hY2lfdHJlZS5vdmVycmlkZXMuc2NzcwpAQCAtMSwyMiArMSwxOCBAQAogLmFjaVRy ZWUgLmFjaVRyZWVMaSB7CiAgIGRpc3BsYXk6IGdyaWQgIWltcG9ydGFudDsKKyAgY3Vyc29yOiBw b2ludGVyOwogfQogLmFjaVRyZWUgLmFjaVRyZWVUZXh0IHsKIAlmb250LWZhbWlseTogJGZvbnQt ZmFtaWx5LXByaW1hcnk7CiAJZm9udC1zaXplOiAwLjgxNXJlbTsKIH0KIC5hY2lUcmVlLmFjaVRy ZWVGb2N1cyAuYWNpVHJlZUZvY3VzID4gLmFjaVRyZWVMaW5lICB7Ci0gIGJhY2tncm91bmQtY29s b3I6ICRjb2xvci1wcmltYXJ5LWxpZ2h0OwotCWJvcmRlci1yaWdodDogJGFjdGl2ZS1ib3JkZXI7 CisgIGJhY2tncm91bmQtY29sb3I6ICRjb2xvci1wcmltYXJ5LWxpZ2h0ICFpbXBvcnRhbnQ7CiB9 CisKIC5hY2lUcmVlIC5hY2lUcmVlU2VsZWN0ZWQgPiAuYWNpVHJlZUxpbmUgewotCWJhY2tncm91 bmQtY29sb3I6ICRjb2xvci1wcmltYXJ5LWxpZ2h0OwotCWJvcmRlci1jb2xvcjogJGNvbG9yLXBy aW1hcnktbGlnaHQ7Ci0JYm9yZGVyLXJpZ2h0OiAkYWN0aXZlLWJvcmRlcjsKLQlib3JkZXItbGVm dDogbm9uZSAhaW1wb3J0YW50OwotCWJvcmRlci10b3A6IG5vbmUgIWltcG9ydGFudDsKLQlib3Jk ZXItYm90dG9tOiBub25lICFpbXBvcnRhbnQ7Ci0JLXdlYmtpdC1ib3JkZXItcmFkaXVzOiBub25l ICFpbXBvcnRhbnQ7CisgIGJhY2tncm91bmQtY29sb3I6ICRjb2xvci1wcmltYXJ5LWxpZ2h0ICFp bXBvcnRhbnQ7CisgIC13ZWJraXQtYm9yZGVyLXJhZGl1czogbm9uZSAhaW1wb3J0YW50OwogICAt bW96LWJvcmRlci1yYWRpdXM6IG5vbmUgIWltcG9ydGFudDsKICAgYm9yZGVyLXJhZGl1czogbm9u ZSAhaW1wb3J0YW50OwogfQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX2Fs ZXJ0LnNjc3MgYi93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9fYWxlcnQuc2NzcwppbmRleCA0ZjU5 MDExZC4uZTg2NzZiOGMgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL19hbGVy dC5zY3NzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL19hbGVydC5zY3NzCkBAIC0yMiw3 ICsyMiw3IEBACiB9CiAKIC5hbGVydC5hbGVydC1pbmZvIHsKLSAgcGFkZGluZzogMTVweDsKKyAg cGFkZGluZzogMC41cmVtOwogfQogCiAuc3VjY2Vzcy1pY29uIHsKQEAgLTQ4LDcgKzQ4LDcgQEAK IC5hbGVydC1pbmZvIHsKICAgYm9yZGVyLWNvbG9yOiAkY29sb3ItcHJpbWFyeTsKICAgYmFja2dy b3VuZC1jb2xvcjogJGNvbG9yLXByaW1hcnktbGlnaHQ7Ci0gIGNvbG9yIDogJGNvbG9yLXByaW1h cnk7CisgIGNvbG9yIDogJGNvbG9yLWZnLXRoZW1lOwogICBiYWNrZ3JvdW5kLWltYWdlOiBub25l OwogfQogCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9fYWxlcnRpZnkub3Zl cnJpZGVzLnNjc3MgYi93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9fYWxlcnRpZnkub3ZlcnJpZGVz LnNjc3MKaW5kZXggMzhiMmM5ZDMuLjI5YzFjZWE3IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9z dGF0aWMvc2Nzcy9fYWxlcnRpZnkub3ZlcnJpZGVzLnNjc3MKKysrIGIvd2ViL3BnYWRtaW4vc3Rh dGljL3Njc3MvX2FsZXJ0aWZ5Lm92ZXJyaWRlcy5zY3NzCkBAIC0yOCwxNCArMjgsNiBAQAogICAg ICAgJiAuYWpzLWNvbnRlbnQgewogICAgICAgICB0b3A6ICR0aXRsZS1oZWlnaHQ7CiAgICAgICB9 Ci0gICAgICAmLnBnYWRtaW5fZ3JhbnRfd2l6YXJkX2JvZHkgewotICAgICAgICBib3JkZXItdG9w LWxlZnQtcmFkaXVzOiAkcGFuZWwtYm9yZGVyLXJhZGl1czsKLSAgICAgICAgYm9yZGVyLXRvcC1y aWdodC1yYWRpdXM6ICRwYW5lbC1ib3JkZXItcmFkaXVzOwotICAgICAgICAmIC5hanMtY29udGVu dCB7Ci0gICAgICAgICAgdG9wOiAwICFpbXBvcnRhbnQ7Ci0gICAgICAgICAgYm9yZGVyLXJhZGl1 czogaW5oZXJpdDsKLSAgICAgICAgfQotICAgICAgfQogICAgIH0KIAogICAgICYgLmFqcy1oZWFk ZXJ7CkBAIC01Miw2ICs0NCw3IEBACiAgICAgJiAuYWpzLWJvZHkgewogICAgICAgJiAuYWpzLWNv bnRlbnQgewogICAgICAgICB0b3A6IDAgIWltcG9ydGFudDsKKyAgICAgICAgcGFkZGluZzogMHB4 OwogICAgICAgfQogICAgIH0KICAgfQpAQCAtMjMxLDQgKzIyNCw5IEBACiAKIC5hbGVydGlmeSAu YWpzLWRpbW1lciB7CiAgIGJhY2tncm91bmQtY29sb3I6ICRsb2FkaW5nLWJnOworfQorCisvKiBJ dCBzb21ldGltZXMgaXMgYXBwbGllZCB0byBkaWFsb2cgYW5kIGJsb2NrcyB0aGUgZGlhbG9nIGZy b20gZWRpdGluZyAqLworLmFsZXJ0aWZ5IC5hanMtZGlhbG9nLmFqcy1jYXB0dXJlOmJlZm9yZSB7 CisgIGRpc3BsYXk6IG5vbmU7CiB9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0t Z2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX2Jvb3RzdHJhcC5vdmVycmlkZXMuc2NzcyBi L3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL19ib290c3RyYXAub3ZlcnJpZGVzLnNjc3MKaW5kZXgg ZmViZTdhZDcuLjJiZDhiNzYwIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9f Ym9vdHN0cmFwLm92ZXJyaWRlcy5zY3NzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL19i b290c3RyYXAub3ZlcnJpZGVzLnNjc3MKQEAgLTI4NSwxMSArMjg1LDEyIEBAIHRkLnN3aXRjaC1j ZWxsID4gZGl2LmJvb3RzdHJhcC1zd2l0Y2ggewogCiAubmF2YmFyLWJyYW5kIHsKIAljb2xvcjog JGNvbG9yLWJyYW5kICFpbXBvcnRhbnQ7Ci0JYmFja2dyb3VuZDogJGNvbG9yLWJyYW5kLWJnICFp bXBvcnRhbnQ7CisJYmFja2dyb3VuZDogJG5hdmJhci1icmFuZC1iZyAhaW1wb3J0YW50OwogCW1h cmdpbi1yaWdodDogMHJlbTsKIAlwYWRkaW5nLWxlZnQ6IDAuNXJlbSAhaW1wb3J0YW50OwogCXBh ZGRpbmctcmlnaHQ6IDFyZW0gIWltcG9ydGFudDsKIAltaW4taGVpZ2h0OiAkbmF2YmFyLWhlaWdo dDsKKwloZWlnaHQ6ICRuYXZiYXItaGVpZ2h0OwogCXBhZGRpbmc6IDByZW07CiAJZGlzcGxheTog ZmxleDsKIAlhbGlnbi1pdGVtczogY2VudGVyICFpbXBvcnRhbnQ7CmRpZmYgLS1naXQgYS93ZWIv cGdhZG1pbi9zdGF0aWMvc2Nzcy9fcGdhZG1pbi5zdHlsZS5zY3NzIGIvd2ViL3BnYWRtaW4vc3Rh dGljL3Njc3MvX3BnYWRtaW4uc3R5bGUuc2NzcwppbmRleCAxYWQ0YjkxZi4uNmVjNDI5MzkgMTAw NjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL19wZ2FkbWluLnN0eWxlLnNjc3MKKysr IGIvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX3BnYWRtaW4uc3R5bGUuc2NzcwpAQCAtMTU1LDYg KzE1NSw3IEBACiAKIC5wZy1uYXZiYXIgewogICBmb250LXNpemU6ICRuYXZiYXItZm9udC1zaXpl OworICBiYWNrZ3JvdW5kLWNvbG9yOiAkbmF2YmFyLWNvbG9yLWJnOwogICBwYWRkaW5nLWxlZnQ6 IDByZW07CiAgIHBhZGRpbmctcmlnaHQ6IDAuNXJlbTsKICAgJiAubmF2LWl0ZW0gLm5hdi1saW5r ewpAQCAtMTYyLDcgKzE2Myw3IEBACiAgIH0KIAogICAucGctbmF2YmFyLWJyYW5kLWFycm93IHsK LSAgICBib3JkZXI6ICRuYXZiYXItaGVpZ2h0LzIgc29saWQgJGNvbG9yLWZnOworICAgIGJvcmRl cjogJG5hdmJhci1oZWlnaHQvMiBzb2xpZCAkbmF2YmFyLWJyYW5kLWFycm93LWJnOwogICAgIGJv cmRlci1yaWdodC1jb2xvcjogdHJhbnNwYXJlbnQ7CiAgICAgYm9yZGVyLWJvdHRvbS1jb2xvcjog dHJhbnNwYXJlbnQ7CiAgICAgYm9yZGVyLXRvcC1jb2xvcjogdHJhbnNwYXJlbnQ7CkBAIC00MzYs NyArNDM3LDcgQEAgZmllbGRzZXQuaW5saW5lLWZpZWxkc2V0IHsKIGZpZWxkc2V0LmlubGluZS1m aWVsZHNldC13aXRob3V0LWJvcmRlciB7CiAgICAgbWFyZ2luOiAwcHg7IG1hcmdpbi1sZWZ0OiAw cHg7IG1hcmdpbi1yaWdodDogMHB4OwogICAgIHBhZGRpbmctcmlnaHQ6IDBweDsgcGFkZGluZy1s ZWZ0OiAwcHg7IHBhZGRpbmctdG9wOiAwcHg7IHBhZGRpbmctYm90dG9tOiAwcHg7Ci0gICAgYm9y ZGVyOiAwcHggc29saWQ7IGJvcmRlci1yYWRpdXM6IDBweDsgZGlzcGxheTogaW5saW5lLWJsb2Nr OworICAgIGJvcmRlcjogMHB4IHNvbGlkOyBib3JkZXItcmFkaXVzOiAwcHg7CiB9CiAKIGZpZWxk c2V0LmlubGluZS1maWVsZHNldCA+IGxlZ2VuZCB7CkBAIC02NzgsMTIgKzY3OSwxNyBAQCBkaXYu cm9sbWVtYmVyc2hpcCB7CiAgIGJvcmRlci1ib3R0b20tbGVmdC1yYWRpdXM6IDVweDsgYm9yZGVy LXN0eWxlOiBzb2xpZCBzb2xpZDsKIH0KIAotLmlubGluZS10YWItcGFuZWwgPiAudGFiLWNvbnRl bnQgewotICBwYWRkaW5nOiAwcHg7Ci0gIG1hcmdpbjogMHB4OwotICBib3JkZXItdG9wOiBub25l OwotICBib3JkZXItYm90dG9tLWxlZnQtcmFkaXVzOiA1cHg7Ci0gIGJvcmRlci1ib3R0b20tcmln aHQtcmFkaXVzOiA1cHg7CisuaW5saW5lLXRhYi1wYW5lbCAgeworICAmID4gLnRhYi1jb250ZW50 IHsKKyAgICBwYWRkaW5nOiAwcHg7CisgICAgbWFyZ2luOiAwcHg7CisgICAgYm9yZGVyLXRvcDog bm9uZTsKKyAgICBib3JkZXItYm90dG9tLWxlZnQtcmFkaXVzOiA1cHg7CisgICAgYm9yZGVyLWJv dHRvbS1yaWdodC1yYWRpdXM6IDVweDsKKyAgfQorICAmLmlubGluZS10YWItcGFuZWwtcGFkZGVk ID4gLnRhYi1jb250ZW50IHsKKyAgICBwYWRkaW5nOiAwLjVyZW07CisgIH0KIH0KIAogLmlubGlu ZS10YWItcGFuZWwgPiAudGFiLWNvbnRlbnQgPiBkaXYudGFiLXBhbmUgewpkaWZmIC0tZ2l0IGEv d2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX3dlYmNhYmluLnBnYWRtaW4uc2NzcyBiL3dlYi9wZ2Fk bWluL3N0YXRpYy9zY3NzL193ZWJjYWJpbi5wZ2FkbWluLnNjc3MKaW5kZXggMzRiNTVhN2IuLjRm ZDkyY2RiIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9fd2ViY2FiaW4ucGdh ZG1pbi5zY3NzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL193ZWJjYWJpbi5wZ2FkbWlu LnNjc3MKQEAgLTYzLDYgKzYzLDEwIEBACiB9CiAKIAorLndjTGF5b3V0IHsKKyAgZGlzcGxheTog YmxvY2s7Cit9CisKIC53Y0xheW91dEdyaWQsIC53Y0xheW91dEdyaWQgdHIsIC53Y0xheW91dEdy aWQgdGQgewogICBib3JkZXI6IDFweCBzb2xpZCAkcGFuZWwtYm9yZGVyLWNvbG9yOwogfQpkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvcmVzb3VyY2VzL19kZWZhdWx0LnZhcmlh Ymxlcy5zY3NzIGIvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvcmVzb3VyY2VzL19kZWZhdWx0LnZh cmlhYmxlcy5zY3NzCmluZGV4IDc5YTUyM2MzLi4xYmViZDVhOCAxMDA2NDQKLS0tIGEvd2ViL3Bn YWRtaW4vc3RhdGljL3Njc3MvcmVzb3VyY2VzL19kZWZhdWx0LnZhcmlhYmxlcy5zY3NzCisrKyBi L3dlYi9wZ2FkbWluL3N0YXRpYy9zY3NzL3Jlc291cmNlcy9fZGVmYXVsdC52YXJpYWJsZXMuc2Nz cwpAQCAtMzcsNyArMzcsNiBAQCAkY29sb3ItZ3JheS1saWdodDogI2ViZWVmMzsKICRjb2xvci1n cmF5LWxpZ2h0ZXI6ICNmM2Y1Zjk7CiAKICRjb2xvci1icmFuZDogJHdoaXRlICFkZWZhdWx0Owot JGNvbG9yLWJyYW5kLWJnOiAjMjIyMjIyOwogCiAkY29sb3ItZWRpdG9yLWJnOiAkY29sb3ItYmcg IWRlZmF1bHQ7CiAkY29sb3ItZWRpdG9yLWtleXdvcmQ6ICM5MDggIWRlZmF1bHQ7CkBAIC02OCw2 ICs2Nyw3IEBAICRib3JkZXItcmFkaXVzOiAwLjI1cmVtOyAvL25vIGNoYW5nZQogCiAkdGV4dC1j b2xvcjogJGNvbG9yLWZnLXRoZW1lOwogJHRleHQtbXV0ZWQ6ICRjb2xvci1ncmF5LWRhcms7CisK ICRuYXZiYXItZGFyay1jb2xvcjogI2ZmZjsKICRuYXZiYXItZGFyay1ob3Zlci1jb2xvcjogI2Zm ZjsKICRuYXZiYXItZGFyay1hY3RpdmUtY29sb3I6ICNmZmY7CkBAIC0xNTMsNiArMTUzLDEwIEBA ICR0aXRsZS1oZWlnaHQ6ICgkbGluZS1oZWlnaHQtYmFzZSoxNnB4KSArIDVweCArIDJweCArICRi b3JkZXItd2lkdGg7CiAkZm9vdGVyLXBhZGRpbmc6IDAuNXJlbTsKICRmb290ZXItbWluLWhlaWdo dDogMnJlbTsKICRmb290ZXItaGVpZ2h0LWNhbGM6ICRmb290ZXItbWluLWhlaWdodCskZm9vdGVy LXBhZGRpbmcqMjsKKworJG5hdmJhci1icmFuZC1iZzogIzIyMjIyMjsgLy9wbGFjZSBpbWFnZSB1 cmwgaWYgaW1hZ2UKKyRuYXZiYXItYnJhbmQtYXJyb3ctYmc6ICMyMjIyMjI7CiskbmF2YmFyLWNv bG9yLWJnOiAkY29sb3ItcHJpbWFyeTsKICRuYXZiYXItZm9udC1zaXplOiAwLjkyNXJlbTsKICRu YXZiYXItdXNlci1mb250LXNpemU6IDAuODc1cmVtOwogCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1p bi90b29scy9iYWNrdXAvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi90b29scy9iYWNrdXAvX19p bml0X18ucHkKaW5kZXggNjBiZmQ1YmYuLmU3MGVhZWRhIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1p bi90b29scy9iYWNrdXAvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvYmFja3Vw L19faW5pdF9fLnB5CkBAIC0xMjUsNiArMTI1LDE4IEBAIGNsYXNzIEJhY2t1cE1lc3NhZ2UoSVBy b2Nlc3NEZXNjKToKIAogICAgICAgICByZXR1cm4gcy5uYW1lLCBob3N0LCBwb3J0CiAKKyAgICBA cHJvcGVydHkKKyAgICBkZWYgdHlwZV9kZXNjKHNlbGYpOgorICAgICAgICBpZiBzZWxmLmJhY2t1 cF90eXBlID09IEJBQ0tVUC5PQkpFQ1Q6CisgICAgICAgICAgICByZXR1cm4gXygiQmFja2luZyB1 cCBhbiBvYmplY3Qgb24gdGhlIHNlcnZlciIpCisgICAgICAgIGlmIHNlbGYuYmFja3VwX3R5cGUg PT0gQkFDS1VQLkdMT0JBTFM6CisgICAgICAgICAgICByZXR1cm4gXygiQmFja2luZyB1cCB0aGUg Z2xvYmFsIG9iamVjdHMiKQorICAgICAgICBlbGlmIHNlbGYuYmFja3VwX3R5cGUgPT0gQkFDS1VQ LlNFUlZFUjoKKyAgICAgICAgICAgIHJldHVybiBfKCJCYWNraW5nIHVwIHRoZSBzZXJ2ZXIiKQor ICAgICAgICBlbHNlOgorICAgICAgICAgICAgIyBJdCBzaG91bGQgbmV2ZXIgcmVhY2ggaGVyZS4K KyAgICAgICAgICAgIHJldHVybiAgXygiVW5rbm93biBCYWNrdXAiKQorCiAgICAgQHByb3BlcnR5 CiAgICAgZGVmIG1lc3NhZ2Uoc2VsZik6CiAgICAgICAgIG5hbWUsIGhvc3QsIHBvcnQgPSBzZWxm LmdldF9zZXJ2ZXJfZGV0YWlscygpCkBAIC0xMzIsNyArMTQ0LDcgQEAgY2xhc3MgQmFja3VwTWVz c2FnZShJUHJvY2Vzc0Rlc2MpOgogICAgICAgICBpZiBzZWxmLmJhY2t1cF90eXBlID09IEJBQ0tV UC5PQkpFQ1Q6CiAgICAgICAgICAgICByZXR1cm4gXygKICAgICAgICAgICAgICAgICAiQmFja2lu ZyB1cCBhbiBvYmplY3Qgb24gdGhlIHNlcnZlciAnezB9JyAiCi0gICAgICAgICAgICAgICAgImZy b20gZGF0YWJhc2UgJ3sxfScuLi4iCisgICAgICAgICAgICAgICAgImZyb20gZGF0YWJhc2UgJ3sx fSciCiAgICAgICAgICAgICApLmZvcm1hdCgKICAgICAgICAgICAgICAgICAiezB9ICh7MX06ezJ9 KSIuZm9ybWF0KAogICAgICAgICAgICAgICAgICAgICBuYW1lLCBob3N0LCBwb3J0CkBAIC0xNDEs MTMgKzE1MywxMyBAQCBjbGFzcyBCYWNrdXBNZXNzYWdlKElQcm9jZXNzRGVzYyk6CiAgICAgICAg ICAgICApCiAgICAgICAgIGlmIHNlbGYuYmFja3VwX3R5cGUgPT0gQkFDS1VQLkdMT0JBTFM6CiAg ICAgICAgICAgICByZXR1cm4gXygiQmFja2luZyB1cCB0aGUgZ2xvYmFsIG9iamVjdHMgb24gIgot ICAgICAgICAgICAgICAgICAgICAgInRoZSBzZXJ2ZXIgJ3swfScuLi4iKS5mb3JtYXQoCisgICAg ICAgICAgICAgICAgICAgICAidGhlIHNlcnZlciAnezB9JyIpLmZvcm1hdCgKICAgICAgICAgICAg ICAgICAiezB9ICh7MX06ezJ9KSIuZm9ybWF0KAogICAgICAgICAgICAgICAgICAgICBuYW1lLCBo b3N0LCBwb3J0CiAgICAgICAgICAgICAgICAgKQogICAgICAgICAgICAgKQogICAgICAgICBlbGlm IHNlbGYuYmFja3VwX3R5cGUgPT0gQkFDS1VQLlNFUlZFUjoKLSAgICAgICAgICAgIHJldHVybiBf KCJCYWNraW5nIHVwIHRoZSBzZXJ2ZXIgJ3swfScuLi4iKS5mb3JtYXQoCisgICAgICAgICAgICBy ZXR1cm4gXygiQmFja2luZyB1cCB0aGUgc2VydmVyICd7MH0nIikuZm9ybWF0KAogICAgICAgICAg ICAgICAgICJ7MH0gKHsxfTp7Mn0pIi5mb3JtYXQoCiAgICAgICAgICAgICAgICAgICAgIG5hbWUs IGhvc3QsIHBvcnQKICAgICAgICAgICAgICAgICApCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90 b29scy9ncmFudF93aXphcmQvc3RhdGljL2pzL2dyYW50X3dpemFyZC5qcyBiL3dlYi9wZ2FkbWlu L3Rvb2xzL2dyYW50X3dpemFyZC9zdGF0aWMvanMvZ3JhbnRfd2l6YXJkLmpzCmluZGV4IDUyODA2 YmJmLi44NWQ3OGRhMiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvZ3JhbnRfd2l6YXJk L3N0YXRpYy9qcy9ncmFudF93aXphcmQuanMKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvZ3JhbnRf d2l6YXJkL3N0YXRpYy9qcy9ncmFudF93aXphcmQuanMKQEAgLTIxOCwxNCArMjE4LDYgQEAgZGVm aW5lKFsKICAgICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICB9OwogICAgICAgICAgICAg fSwKLSAgICAgICAgICAgIGhvb2tzOiB7Ci0gICAgICAgICAgICAgIG9uc2hvdzogZnVuY3Rpb24o KSB7Ci0KLSAgICAgICAgICAgICAgICAvLyBBZGQgcGdhZG1pbl9ncmFudF93aXphcmRfYm9keSBj bGFzcyB0byBkaWFsb2cKLSAgICAgICAgICAgICAgICAkKHRoaXMuZWxlbWVudHMuYm9keSkuYWRk Q2xhc3MoJ3BnYWRtaW5fZ3JhbnRfd2l6YXJkX2JvZHknKTsKLSAgICAgICAgICAgICAgfSwKLSAg ICAgICAgICAgIH0sCi0KICAgICAgICAgICAgIC8qKgogICAgICAgICAgICAgICBSZXR1cm5zIGEg UGFnaW5hdG9yIENsYXNzIE9iamVjdCB3aGljaCBpcyBhZ2FpbiB0byBiZSByZW5kZXJlZAogCmRp ZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9pbXBvcnRfZXhwb3J0L19faW5pdF9fLnB5IGIv d2ViL3BnYWRtaW4vdG9vbHMvaW1wb3J0X2V4cG9ydC9fX2luaXRfXy5weQppbmRleCAzYTg3NDY2 MC4uNGU5YjJkMGEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL2ltcG9ydF9leHBvcnQv X19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvaW1wb3J0X2V4cG9ydC9fX2luaXRf Xy5weQpAQCAtMTE0LDExICsxMTQsMTUgQEAgY2xhc3MgSUVNZXNzYWdlKElQcm9jZXNzRGVzYyk6 CiAKICAgICAgICAgcmV0dXJuIF8oCiAgICAgICAgICAgICAiQ29weWluZyB0YWJsZSBkYXRhICd7 MH0uezF9JyBvbiBkYXRhYmFzZSAnezJ9JyAiCi0gICAgICAgICAgICAiYW5kIHNlcnZlciAoezN9 Ons0fSkuLi4iCisgICAgICAgICAgICAiYW5kIHNlcnZlciAoezN9Ons0fSkiCiAgICAgICAgICku Zm9ybWF0KAogICAgICAgICAgICAgc2VsZi5zY2hlbWEsIHNlbGYudGFibGUsIHNlbGYuZGF0YWJh c2UsIHMuaG9zdCwgcy5wb3J0CiAgICAgICAgICkKIAorICAgIEBwcm9wZXJ0eQorICAgIGRlZiB0 eXBlX2Rlc2Moc2VsZik6CisgICAgICAgIHJldHVybiBfKCJDb3B5aW5nIHRhYmxlIGRhdGEiKQor CiAgICAgZGVmIGRldGFpbHMoc2VsZiwgY21kLCBhcmdzKToKICAgICAgICAgIyBGZXRjaCB0aGUg c2VydmVyIGRldGFpbHMgbGlrZSBob3N0bmFtZSwgcG9ydCwgcm9sZXMgZXRjCiAgICAgICAgIHMg PSBTZXJ2ZXIucXVlcnkuZmlsdGVyX2J5KApAQCAtMTI4LDcgKzEzMiw3IEBAIGNsYXNzIElFTWVz c2FnZShJUHJvY2Vzc0Rlc2MpOgogICAgICAgICByZXMgPSAnPGRpdj4nCiAgICAgICAgIHJlcyAr PSBfKAogICAgICAgICAgICAgIkNvcHlpbmcgdGFibGUgZGF0YSAnezB9LnsxfScgb24gZGF0YWJh c2UgJ3syfScgIgotICAgICAgICAgICAgImZvciB0aGUgc2VydmVyICd7M30nLi4uIgorICAgICAg ICAgICAgImZvciB0aGUgc2VydmVyICd7M30nIgogICAgICAgICApLmZvcm1hdCgKICAgICAgICAg ICAgIGh0bWwuc2FmZV9zdHIoc2VsZi5zY2hlbWEpLAogICAgICAgICAgICAgaHRtbC5zYWZlX3N0 cihzZWxmLnRhYmxlKSwKQEAgLTE0MCwxMSArMTQ0LDExIEBAIGNsYXNzIElFTWVzc2FnZShJUHJv Y2Vzc0Rlc2MpOgogICAgICAgICAgICAgKQogICAgICAgICApCiAKLSAgICAgICAgcmVzICs9ICc8 L2Rpdj48ZGl2PicKKyAgICAgICAgcmVzICs9ICc8L2Rpdj48ZGl2IGNsYXNzPSJweS0xIj4nCiAg ICAgICAgIHJlcyArPSBfKCJSdW5uaW5nIGNvbW1hbmQ6IikKLSAgICAgICAgcmVzICs9ICc8L2I+ PGJyPjxzcGFuIGNsYXNzPSJwZy1iZy1jbWQgZW5hYmxlLXNlbGVjdGlvbiI+JworICAgICAgICBy ZXMgKz0gJzxkaXYgY2xhc3M9InBnLWJnLWNtZCBlbmFibGUtc2VsZWN0aW9uIHAtMSI+JwogICAg ICAgICByZXMgKz0gaHRtbC5zYWZlX3N0cihzZWxmLl9jbWQpCi0gICAgICAgIHJlcyArPSAnPC9z cGFuPjwvZGl2PicKKyAgICAgICAgcmVzICs9ICc8L2Rpdj48L2Rpdj4nCiAKICAgICAgICAgcmV0 dXJuIHJlcwogCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9tYWludGVuYW5jZS9fX2lu aXRfXy5weSBiL3dlYi9wZ2FkbWluL3Rvb2xzL21haW50ZW5hbmNlL19faW5pdF9fLnB5CmluZGV4 IDZhZTAxNTllLi41ZDM2MmY5ZSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvbWFpbnRl bmFuY2UvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvbWFpbnRlbmFuY2UvX19p bml0X18ucHkKQEAgLTkzLDYgKzkzLDEwIEBAIGNsYXNzIE1lc3NhZ2UoSVByb2Nlc3NEZXNjKToK ICAgICAgICAgaWYgc2VsZi5kYXRhWydvcCddID09ICJDTFVTVEVSIjoKICAgICAgICAgICAgIHJl dHVybiByZXMuZm9ybWF0KF8oJ0NsdXN0ZXInKSkKIAorICAgIEBwcm9wZXJ0eQorICAgIGRlZiB0 eXBlX2Rlc2Moc2VsZik6CisgICAgICAgIHJldHVybiBfKCJNYWludGVuYW5jZSIpCisKICAgICBk ZWYgZGV0YWlscyhzZWxmLCBjbWQsIGFyZ3MpOgogCiAgICAgICAgIHJlcyA9IE5vbmUKZGlmZiAt LWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0aWMvY3NzL3NxbGVkaXRvci5j c3MgYi93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3RhdGljL2Nzcy9zcWxlZGl0b3IuY3Nz CmluZGV4IDkxYzUxNWY0Li4zMzdjNjU4MiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMv c3FsZWRpdG9yL3N0YXRpYy9jc3Mvc3FsZWRpdG9yLmNzcworKysgYi93ZWIvcGdhZG1pbi90b29s cy9zcWxlZGl0b3Ivc3RhdGljL2Nzcy9zcWxlZGl0b3IuY3NzCkBAIC0xNCwxMCArMTQsNiBAQAog ICBib3R0b206IDA7CiB9CiAKLSNlZGl0b3ItcGFuZWwgewotICB6LWluZGV4OiAwOwotfQotCiAu c3FsLWVkaXRvci1ncmlkLWNvbnRhaW5lciB7CiAgIGhlaWdodDogMTAwJTsKICAgb3ZlcmZsb3c6 IGF1dG87CkBAIC01NSwxMiArNTEsNiBAQAogICBtYXgtd2lkdGg6IDM1cHggIWltcG9ydGFudDsK ICAgbWluLXdpZHRoOiAzNXB4ICFpbXBvcnRhbnQ7CiB9Ci0KLS5zcWwtZWRpdG9yLWhpc3Rvcnkt Y29udGFpbmVyIHsKLSAgaGVpZ2h0OiAxMDAlOwotICBvdmVyZmxvdzogYXV0bzsKLX0KLQogLnNx bC1zdGF0dXMtY2VsbCB7CiAgIG1heC13aWR0aDogMzBweDsKIH0KZGlmZiAtLWdpdCBhL3dlYi9w Z2FkbWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0aWMvanMvc3FsZWRpdG9yLmpzIGIvd2ViL3BnYWRt aW4vdG9vbHMvc3FsZWRpdG9yL3N0YXRpYy9qcy9zcWxlZGl0b3IuanMKaW5kZXggN2ZmM2RjMGIu LjYzMjc4ZGYzIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3RhdGlj L2pzL3NxbGVkaXRvci5qcworKysgYi93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3RhdGlj L2pzL3NxbGVkaXRvci5qcwpAQCAtMTg1LDcgKzE4NSw3IEBAIGRlZmluZSgndG9vbHMucXVlcnl0 b29sJywgWwogICAgICAgICBuYW1lOiAnc3FsX3BhbmVsJywKICAgICAgICAgdGl0bGU6IGdldHRl eHQoJ1F1ZXJ5IEVkaXRvcicpLAogICAgICAgICB3aWR0aDogJzEwMCUnLAotICAgICAgICBoZWln aHQ6ICcyMCUnLAorICAgICAgICBoZWlnaHQ6ICc1MCUnLAogICAgICAgICBpc0Nsb3NlYWJsZTog ZmFsc2UsCiAgICAgICAgIGlzUHJpdmF0ZTogdHJ1ZSwKICAgICAgIH0pOwpkaWZmIC0tZ2l0IGEv d2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL3N0YXRpYy9zY3NzL19oaXN0b3J5LnNjc3MgYi93 ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3RhdGljL3Njc3MvX2hpc3Rvcnkuc2NzcwppbmRl eCAwMWRkMGMxOC4uMDMwMjRmMDMgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVk aXRvci9zdGF0aWMvc2Nzcy9faGlzdG9yeS5zY3NzCisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3Nx bGVkaXRvci9zdGF0aWMvc2Nzcy9faGlzdG9yeS5zY3NzCkBAIC0yLDYgKzIsNyBAQAogICBoZWln aHQ6IDEwMCU7CiAgIC5saXN0LWl0ZW0gewogICAgIGJvcmRlci1ib3R0b206ICRwYW5lbC1ib3Jk ZXI7CisgICAgYmFja2dyb3VuZC1jb2xvcjogJGNvbG9yLWJnLXRoZW1lOwogICB9CiAKICAgLmVu dHJ5IHsKQEAgLTc2LDExICs3NywxOSBAQAogICBkaXNwbGF5OiBibG9jazsKIH0KIAorCisuc3Fs LWVkaXRvci1oaXN0b3J5LWNvbnRhaW5lciB7CisgIGhlaWdodDogMTAwJTsKKyAgb3ZlcmZsb3c6 IGF1dG87CisgIGJhY2tncm91bmQtY29sb3I6ICRuZWdhdGl2ZS1iZzsKK30KKworCiAucXVlcnkt ZGV0YWlsIHsKICAgd2lkdGg6IDEwMCU7CiAgIGRpc3BsYXk6IGZsZXg7CiAgIGZsZXgtZGlyZWN0 aW9uOiBjb2x1bW47Ci0KKyAgYmFja2dyb3VuZC1jb2xvcjogJGNvbG9yLWJnLXRoZW1lOwogICAu ZXJyb3ItbWVzc2FnZS1ibG9jayB7CiAgICAgYmFja2dyb3VuZDogJHNxbC1oaXN0b3J5LWVycm9y LWJnOwogICAgIGZsZXg6IDAuMzsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVk aXRvci9zdGF0aWMvc2Nzcy9fc3FsZWRpdG9yLnNjc3MgYi93ZWIvcGdhZG1pbi90b29scy9zcWxl ZGl0b3Ivc3RhdGljL3Njc3MvX3NxbGVkaXRvci5zY3NzCmluZGV4IGExY2FjMDRkLi5kMDE3ZTY2 NyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL3N0YXRpYy9zY3NzL19z cWxlZGl0b3Iuc2NzcworKysgYi93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3RhdGljL3Nj c3MvX3NxbGVkaXRvci5zY3NzCkBAIC0xOCw2ICsxOCwxNCBAQAogICB6LWluZGV4OiAwOwogfQog CisKKy5lZGl0b3ItdGl0bGUgeworICBwYWRkaW5nOiAkc3FsLXRpdGxlLXBhZGRpbmc7CisgIGJh Y2tncm91bmQ6ICRzcWwtdGl0bGUtYmc7CisgIGNvbG9yOiAkc3FsLXRpdGxlLWZnOworfQorCisK ICNlZGl0b3ItcGFuZWwgewogICB6LWluZGV4OiAwOwogICBwb3NpdGlvbjogYWJzb2x1dGU7CkBA IC0yMDksNiArMjE3LDcgQEAgbGkuQ29kZU1pcnJvci1oaW50LWFjdGl2ZSB7CiAvKiBjb2xvciB0 aGUgZmlyc3QgY29sdW1uICovCiAjZGF0YWdyaWQgLnNsaWNrLXJvdyAuc2xpY2stY2VsbC5sMC5y MC5zZWxlY3RlZCB7CiAgIGJhY2tncm91bmQtY29sb3I6ICRjb2xvci1wcmltYXJ5OworICBjb2xv cjogJGNvbG9yLXByaW1hcnktZmc7CiB9CiAKICNkYXRhZ3JpZCAuc2xpY2stcm93ID4gLnNsaWNr LWNlbGw6bm90KC5sMCk6bm90KC5yMCkuc2VsZWN0ZWQgewpAQCAtMjMzLDEyICsyNDIsNiBAQCBs aS5Db2RlTWlycm9yLWhpbnQtYWN0aXZlIHsKICAgYm94LXNoYWRvdzogJGRyb3Bkb3duLWJveC1z aGFkb3c7CiB9CiAKLS5lZGl0b3ItdGl0bGUgewotICBwYWRkaW5nOiAkc3FsLXRpdGxlLXBhZGRp bmc7Ci0gIGJhY2tncm91bmQ6ICRzcWwtdGl0bGUtYmc7Ci0gIGNvbG9yOiAkc3FsLXRpdGxlLWZn OwotfQotCiAucGdfdGV4dF9lZGl0b3IgdGV4dGFyZWEgewogICByZXNpemU6IGJvdGg7CiB9CmRp ZmYgLS1naXQgYS93ZWIvcmVncmVzc2lvbi9qYXZhc2NyaXB0L2hpc3RvcnkvcXVlcnlfaGlzdG9y eV9zcGVjLmpzeCBiL3dlYi9yZWdyZXNzaW9uL2phdmFzY3JpcHQvaGlzdG9yeS9xdWVyeV9oaXN0 b3J5X3NwZWMuanN4CmluZGV4IDBiMTc5ZjRmLi43ZGVmMmU0MyAxMDA2NDQKLS0tIGEvd2ViL3Jl Z3Jlc3Npb24vamF2YXNjcmlwdC9oaXN0b3J5L3F1ZXJ5X2hpc3Rvcnlfc3BlYy5qc3gKKysrIGIv d2ViL3JlZ3Jlc3Npb24vamF2YXNjcmlwdC9oaXN0b3J5L3F1ZXJ5X2hpc3Rvcnlfc3BlYy5qc3gK QEAgLTYxLDcgKzYxLDcgQEAgZGVzY3JpYmUoJ1F1ZXJ5SGlzdG9yeScsICgpID0+IHsKIAogICAg IGl0KCdub3RoaW5nIGlzIGRpc3BsYXllZCBpbiB0aGUgaGlzdG9yeSBkZXRhaWxzIHBhbmVsJywg KGRvbmUpID0+IHsKICAgICAgIGxldCBmb3VuZENoaWxkcmVuID0gaGlzdG9yeVdyYXBwZXIuZmlu ZChRdWVyeUhpc3RvcnlEZXRhaWwpOwotICAgICAgZXhwZWN0KGZvdW5kQ2hpbGRyZW4ubGVuZ3Ro KS50b0JlKDEpOworICAgICAgZXhwZWN0KGZvdW5kQ2hpbGRyZW4ubGVuZ3RoKS50b0JlKDApOwog ICAgICAgZG9uZSgpOwogICAgIH0pOwogICB9KTsKZGlmZiAtLWdpdCBhL3dlYi9yZWdyZXNzaW9u L2phdmFzY3JpcHQvdHJlZS90cmVlX2Zha2UuanMgYi93ZWIvcmVncmVzc2lvbi9qYXZhc2NyaXB0 L3RyZWUvdHJlZV9mYWtlLmpzCmluZGV4IGZjOTRkM2YxLi40MzdkNTM3OCAxMDA2NDQKLS0tIGEv d2ViL3JlZ3Jlc3Npb24vamF2YXNjcmlwdC90cmVlL3RyZWVfZmFrZS5qcworKysgYi93ZWIvcmVn cmVzc2lvbi9qYXZhc2NyaXB0L3RyZWUvdHJlZV9mYWtlLmpzCkBAIC00Myw2ICs0MywxMCBAQCBl eHBvcnQgY2xhc3MgVHJlZUZha2UgZXh0ZW5kcyBUcmVlIHsKICAgICAgIFsnQUNJVHJlZUFwaSdd LCBbJ3NldElub2RlJywgJ3VubG9hZCcsICdkZXNlbGVjdCcsICdzZWxlY3QnXSk7CiAgIH0KIAor ICBiaW5kQ2xpY2tFdmVudHMoZG9tTm9kZSkgeworICAgIHJldHVybiBkb21Ob2RlOworICB9CisK ICAgYWRkTmV3Tm9kZShpZCwgZGF0YSwgZG9tTm9kZSwgcGF0aCkgewogICAgIHRoaXMuYWNpVHJl ZVRvT3VyVHJlZVRyYW5zbGF0b3JbaWRdID0gW2lkXTsKICAgICBpZiAocGF0aCAhPT0gbnVsbCAm JiBwYXRoICE9PSB1bmRlZmluZWQpIHsKZGlmZiAtLWdpdCBhL3dlYi9yZWdyZXNzaW9uL2phdmFz Y3JpcHQvdHJlZS90cmVlX3NwZWMuanMgYi93ZWIvcmVncmVzc2lvbi9qYXZhc2NyaXB0L3RyZWUv dHJlZV9zcGVjLmpzCmluZGV4IDUzMTUyNWE2Li4yMTU5MzgyNCAxMDA2NDQKLS0tIGEvd2ViL3Jl Z3Jlc3Npb24vamF2YXNjcmlwdC90cmVlL3RyZWVfc3BlYy5qcworKysgYi93ZWIvcmVncmVzc2lv bi9qYXZhc2NyaXB0L3RyZWUvdHJlZV9zcGVjLmpzCkBAIC0xNiw2ICsxNiw3IEBAIGNvbnN0IHRy ZWVUZXN0cyA9ICh0cmVlQ2xhc3MsIHNldERlZmF1bHRDYWxsQmFjaykgPT4gewogICBsZXQgdHJl ZTsKICAgYmVmb3JlRWFjaCgoKSA9PiB7CiAgICAgdHJlZSA9IG5ldyB0cmVlQ2xhc3MoKTsKKyAg ICBzcHlPbih0cmVlLCAnYmluZENsaWNrRXZlbnRzJyk7CiAgIH0pOwogCiAgIGRlc2NyaWJlKCcj YWRkTmV3Tm9kZScsICgpID0+IHsK --0000000000004b31c5057f7b93bf--