Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1evkN9-0003qs-Tm for pgadmin-hackers@arkaria.postgresql.org; Tue, 13 Mar 2018 13:53:48 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1evkN8-0004xG-8Y for pgadmin-hackers@arkaria.postgresql.org; Tue, 13 Mar 2018 13:53:46 +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_SHA384:256) (Exim 4.89) (envelope-from ) id 1evkN7-0004x6-9M for pgadmin-hackers@lists.postgresql.org; Tue, 13 Mar 2018 13:53:46 +0000 Received: from mail-io0-x22c.google.com ([2607:f8b0:4001:c06::22c]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1evkN0-000548-Hr for pgadmin-hackers@postgresql.org; Tue, 13 Mar 2018 13:53:44 +0000 Received: by mail-io0-x22c.google.com with SMTP id e30so201398ioc.3 for ; Tue, 13 Mar 2018 06:53:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pivotal-io.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=I1Qr60K4qDADA/NBxdbUYasGYZXye7Inuv17Lp0gu4k=; b=hPJQdBaP2+ApdvDc8/r/EuAtOEZHadAISjMsEo64xJG4jGKbssltoCfKHST0ec6iOr Hpr1i8n+2AphcTWrz8qgSkydMiGId+U/9F/ER2BM+9OxRG9yXPMlnLZ++meT3BnzkNsN zwNcxfNuxmdLiqam7gWIJ/cT8s9GEgCHHwuldWbwOIXzHVZy1TcbOZJRoXOxOCW4Rp0J ErYhLh8zhTFqrpQunUVzxY6YGs0CIXvOIq46LUQyQeaPQON+Ub3hPTfm9sz3M01tPEv2 sC7Ud1fSHrAnnh+642IYOwwL7YgDLtGBnVUF5QkEWhfo80v/dPcNPNiL3de+Cl7RRp0w 3rEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=I1Qr60K4qDADA/NBxdbUYasGYZXye7Inuv17Lp0gu4k=; b=RH12MWhskjVFBgK9WxrMVpt+wxGwtV6ukbOEmsXQHzl2NfIbU6jkVfxwdUmE965iQt aIT18beS6gfgJ/IdqhMxwVqnbR7emyKTB4zNDJAZbSC5GHmPkHbwD+izmSIXP36JIKku xLa7kJssB3iDVrkPiB5IArfC0m5Sho/b6NpZYJ5nmiDak75tByF2eV8KcP2uqESdKWNl LQPAWLPUPo0/v0ON/+6BtSqRBR3PVq/tj6bx5mlLIEErBrW/K+Aq3xEp1bwWFQLGYLKS gqmsqOdJOWtd/Df/mF5y+J7gOwaLl6kA/zwrHzbzv5wYZ8XtFF0n6imNSCgSKtKKrI9d 1HMg== X-Gm-Message-State: AElRT7GXVM9skfR9G+hrRhBSKUTE+T/k9MOHyuPM4E6GTSViyfC/oc2d o6FDz9xUL1gL8XTja/QBW5kaI3ko8+kAwkp255mUnQ== X-Google-Smtp-Source: AG47ELu7s2xLpRiH2zChxjcnMKYuyxq4gr7CvFalwS5O93fuR1RBU3FktdZ3A4UQPTJ0/uvhHWEVwLC6vpXpUz7sU54= X-Received: by 10.107.172.130 with SMTP id v124mr761344ioe.301.1520949215681; Tue, 13 Mar 2018 06:53:35 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.141.58 with HTTP; Tue, 13 Mar 2018 06:53:34 -0700 (PDT) In-Reply-To: References: From: Victoria Henry Date: Tue, 13 Mar 2018 09:53:34 -0400 Message-ID: Subject: Re: [pgAdmin4][RM#3140] Add service parameter To: Dave Page Cc: Joao De Almeida Pereira , Murtuza Zabuawala , pgadmin-hackers Content-Type: multipart/mixed; boundary="001a114c053cb9427705674b9545" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --001a114c053cb9427705674b9545 Content-Type: multipart/alternative; boundary="001a114c053cb9427205674b9543" --001a114c053cb9427205674b9543 Content-Type: text/plain; charset="UTF-8" Hi Dave, We've made updated our previous patch to fix the error messages. Attached are our updated patches. On Mon, Mar 12, 2018 at 8:48 PM, Dave Page wrote: > Hi > > On Mon, Mar 12, 2018 at 5:18 PM, Joao De Almeida Pereira < > jdealmeidapereira@pivotal.io> wrote: > >> Hi Dave and Murtuza, >> >> Regarding this patch we refactored the Javascript code so that is lives >> in a different file and added some tests. >> >> Also we found an issue with karma-jasmine that does not allow us to use >> jasmine 3.1 yet. You can find attached a patch that reverts that commit. >> > > Sounds good, but neither patch will apply (in fact, the Jasmine one looks > entirely backwards). One of the error messages was changed in Murtuza's > patch, and wasn't reflected in your update for example. > > Can you rebase please? > > Thanks. > > >> >> Thanks >> Victoria && Joao >> >> On Mon, Mar 12, 2018 at 4:46 PM Dave Page wrote: >> >>> Thanks, patch applied! >>> >>> On Mon, Mar 12, 2018 at 3:31 AM, Murtuza Zabuawala < >>> murtuza.zabuawala@enterprisedb.com> wrote: >>> >>>> Hi Dave, >>>> >>>> PFA updated patch. >>>> >>>> -- >>>> Regards, >>>> Murtuza Zabuawala >>>> EnterpriseDB: http://www.enterprisedb.com >>>> The Enterprise PostgreSQL Company >>>> >>>> >>>> On Fri, Mar 9, 2018 at 9:29 PM, Murtuza Zabuawala < >>>> murtuza.zabuawala@enterprisedb.com> wrote: >>>> >>>>> Hi Dave, >>>>> >>>>> I'll change the name and send you updated patch. >>>>> >>>>> >>>>> On Fri, Mar 9, 2018 at 9:25 PM, Dave Page wrote: >>>>> >>>>>> HI >>>>>> >>>>>> On Fri, Mar 9, 2018 at 11:47 AM, Murtuza Zabuawala < >>>>>> murtuza.zabuawala@enterprisedb.com> wrote: >>>>>> >>>>>>> Hi, >>>>>>> >>>>>>> PFA patch to add service parameter in server dialog. >>>>>>> - Docs updated >>>>>>> - Test case added for Service ID parameter >>>>>>> >>>>>>> Please note, >>>>>>> I have extracted Connection class and Server manager class from our >>>>>>> own custom Psycopg2 driver module. >>>>>>> >>>>>>> Patch also covers RM#3120 >>>>>>> >>>>>> >>>>>> This patch seems a little confused. The "Service" and "Service ID" >>>>>> fields from pgAdmin 3 are very different things. The Redmine ticket seems >>>>>> to be asking for the Service field (the pg_service.conf service name), >>>>>> *not* Service ID (the operating system's service ID, used to start/stop the >>>>>> database server service). >>>>>> >>>>>> -- >>>>>> Dave Page >>>>>> Blog: http://pgsnake.blogspot.com >>>>>> Twitter: @pgsnake >>>>>> >>>>>> EnterpriseDB UK: http://www.enterprisedb.com >>>>>> The Enterprise PostgreSQL Company >>>>>> >>>>> >>>>> >>>> >>> >>> >>> -- >>> Dave Page >>> Blog: http://pgsnake.blogspot.com >>> Twitter: @pgsnake >>> >>> EnterpriseDB UK: http://www.enterprisedb.com >>> The Enterprise PostgreSQL Company >>> >> > > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > --001a114c053cb9427205674b9543 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Dave,

We've made updated our pre= vious patch to fix the error messages.=C2=A0 Attached are our updated patch= es.

On= Mon, Mar 12, 2018 at 8:48 PM, Dave Page <dpage@pgadmin.org>= wrote:
Hi

On Mon, Ma= r 12, 2018 at 5:18 PM, Joao De Almeida Pereira <jdealmeidaperei= ra@pivotal.io> wrote:
Hi Dave and Murtuza,

Regarding this patch we= refactored the Javascript code so that is lives in a different file and ad= ded some tests.

Also we found an issue with karma-= jasmine that does not allow us to use jasmine 3.1 yet. You can find attache= d a patch that reverts that commit.

=
Sounds good, but neither patch will apply (in fact, the Jasmine= one looks entirely backwards). One of the error messages was changed in Mu= rtuza's patch, and wasn't reflected in your update for example.

Can you rebase please?

Thank= s.
=C2=A0

Thanks
Victoria &&am= p; Joao

On Mon, Mar 12, 2018 at 4:46 PM Dave Page &l= t;dpage@pgadmin.org<= /a>> wrote:

On Mon, Mar 12, 2018 at 3:31 AM, Murtuza Zabuawala <murtuza.zabuawala@enterprisedb.com> wrote:
Hi Dave,

PFA updated patch.

--
Regar= ds,
Murtuza Zabuawala
EnterpriseDB:=C2=A0http://www.enterp= risedb.com
The Enterprise PostgreSQL Company

=
<= /div>

On Fri, Mar 9, 2018 at 9:29 PM, Murtuza Zabu= awala <murtuza.zabuawala@enterprisedb.com> wrote:
Hi Dave,

I'll change the name and s= end you updated patch.
<= div dir=3D"ltr">

=

On Fri, Mar 9, 2018 at 9:25 PM, Dave Page <= dpage@pgadmin.org> wrote:
<= div dir=3D"ltr">HI

On Fri, Mar 9, 2018 at 11:47 AM, Murtuza Zabuawala &= lt;= murtuza.zabuawala@enterprisedb.com> wrote:
Hi,

PFA patch to add=C2=A0service parameter in se= rver dialog.
- Docs updated
- Test case added for Service ID parameter

Please note,
I have= extracted Connection class and Server manager class from our own custom Ps= ycopg2 driver module.

Patch also covers RM#3120
<= br>
=C2=A0This patch seems a little confused. The "Service&q= uot; and "Service ID" fields from pgAdmin 3 are very different th= ings. The Redmine ticket seems to be asking for the Service field (the pg_s= ervice.conf service name), *not* Service ID (the operating system's ser= vice ID, used to start/stop the database server service).

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

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





--
Dave Page
Blog: http://pgsnake.blogspot.com<= /a>
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Ente= rprise PostgreSQL Company



--
Dave Page
Blog: http://pgsnake.blogspot.com
Tw= itter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise Po= stgreSQL Company

--001a114c053cb9427205674b9543-- --001a114c053cb9427705674b9545 Content-Type: text/x-patch; charset="US-ASCII"; name="refactor-javascript.diff" Content-Disposition: attachment; filename="refactor-javascript.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jeppo2rv0 ZGlmZiAtLWdpdCBhL3dlYi9wYWNrYWdlLmpzb24gYi93ZWIvcGFja2FnZS5qc29uCmluZGV4IGFk MGYzZTE2Li42NjY4NGZjNiAxMDA2NDQKLS0tIGEvd2ViL3BhY2thZ2UuanNvbgorKysgYi93ZWIv cGFja2FnZS5qc29uCkBAIC02OSw2ICs2OSw3IEBACiAgICAgImhhcmQtc291cmNlLXdlYnBhY2st cGx1Z2luIjogIl4wLjQuOSIsCiAgICAgImltbXV0YWJpbGl0eS1oZWxwZXIiOiAiXjIuMi4wIiwK ICAgICAiaW1wb3J0cy1sb2FkZXIiOiAiXjAuNy4xIiwKKyAgICAiaXAtYWRkcmVzcyI6ICJeNS44 LjkiLAogICAgICJqcXVlcnkiOiAiMS4xMS4yIiwKICAgICAianF1ZXJ5LWNvbnRleHRtZW51Ijog Il4yLjUuMCIsCiAgICAgImpxdWVyeS11aSI6ICJeMS4xMi4xIiwKZGlmZiAtLWdpdCBhL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3N0YXRpYy9qcy9zZXJ2ZXIuanMg Yi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9zdGF0aWMvanMvc2Vy dmVyLmpzCmluZGV4IDM2OTA4NzMzLi4zMDJmZTQ1OCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4v YnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvc3RhdGljL2pzL3NlcnZlci5qcworKysgYi93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9zdGF0aWMvanMvc2VydmVy LmpzCkBAIC0yLDEwICsyLDEzIEBAIGRlZmluZSgncGdhZG1pbi5ub2RlLnNlcnZlcicsIFsKICAg J3NvdXJjZXMvZ2V0dGV4dCcsICdzb3VyY2VzL3VybF9mb3InLCAnanF1ZXJ5JywgJ3VuZGVyc2Nv cmUnLCAnYmFja2JvbmUnLAogICAndW5kZXJzY29yZS5zdHJpbmcnLCAnc291cmNlcy9wZ2FkbWlu JywgJ3BnYWRtaW4uYnJvd3NlcicsCiAgICdwZ2FkbWluLnNlcnZlci5zdXBwb3J0ZWRfc2VydmVy cycsICdwZ2FkbWluLnVzZXJfbWFuYWdlbWVudC5jdXJyZW50X3VzZXInLAotICAncGdhZG1pbi5h bGVydGlmeWpzJywgJ3BnYWRtaW4uYmFja2Zvcm0nLCAncGdhZG1pbi5icm93c2VyLnNlcnZlci5w cml2aWxlZ2UnLAorICAncGdhZG1pbi5hbGVydGlmeWpzJywgJ3BnYWRtaW4uYmFja2Zvcm0nLAor ICAnc291cmNlcy9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9tb2RlbF92YWxpZGF0aW9u JywKKyAgJ3BnYWRtaW4uYnJvd3Nlci5zZXJ2ZXIucHJpdmlsZWdlJywKIF0sIGZ1bmN0aW9uKAog ICBnZXR0ZXh0LCB1cmxfZm9yLCAkLCBfLCBCYWNrYm9uZSwgUywgcGdBZG1pbiwgcGdCcm93c2Vy LAotICBzdXBwb3J0ZWRfc2VydmVycywgY3VycmVudF91c2VyLCBBbGVydGlmeSwgQmFja2Zvcm0K KyAgc3VwcG9ydGVkX3NlcnZlcnMsIGN1cnJlbnRfdXNlciwgQWxlcnRpZnksIEJhY2tmb3JtLAor ICBtb2RlbFZhbGlkYXRpb24KICkgewogCiAgIGlmICghcGdCcm93c2VyLk5vZGVzWydzZXJ2ZXIn XSkgewpAQCAtODQ4LDExMCArODUxLDggQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUuc2VydmVyJywg WwogICAgICAgICAgIGdyb3VwOiBnZXR0ZXh0KCdDb25uZWN0aW9uJyksCiAgICAgICAgIH1dLAog ICAgICAgICB2YWxpZGF0ZTogZnVuY3Rpb24oKSB7Ci0gICAgICAgICAgdmFyIGVyciA9IHt9LAot ICAgICAgICAgICAgZXJybXNnLAotICAgICAgICAgICAgc2VsZiA9IHRoaXM7Ci0KLSAgICAgICAg ICB2YXIgc2VydmljZV9pZCA9IHRoaXMuZ2V0KCdzZXJ2aWNlJyk7Ci0KLSAgICAgICAgICB2YXIg Y2hlY2tfZm9yX2VtcHR5ID0gZnVuY3Rpb24oaWQsIG1zZykgewotICAgICAgICAgICAgdmFyIHYg PSBzZWxmLmdldChpZCk7Ci0gICAgICAgICAgICBpZiAoCi0gICAgICAgICAgICAgIF8uaXNVbmRl ZmluZWQodikgfHwgdiA9PT0gbnVsbCB8fCBTdHJpbmcodikucmVwbGFjZSgvXlxzK3xccyskL2cs ICcnKSA9PSAnJwotICAgICAgICAgICAgKSB7Ci0gICAgICAgICAgICAgIGVycltpZF0gPSBtc2c7 Ci0gICAgICAgICAgICAgIGVycm1zZyA9IGVycm1zZyB8fCBtc2c7Ci0gICAgICAgICAgICAgIHJl dHVybiB0cnVlOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgc2VsZi5lcnJv ck1vZGVsLnVuc2V0KGlkKTsKLSAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAg ICAgfQotICAgICAgICAgIH07Ci0gICAgICAgICAgdmFyIGNoZWNrX2Zvcl92YWxpZF9pcHY2ID0g ZnVuY3Rpb24odmFsKXsKLSAgICAgICAgICAgIC8vIFJlZ3VsYXIgZXhwcmVzc2lvbiBmb3IgdmFs aWRhdGluZyBJUHY2IGFkZHJlc3MgZm9ybWF0cwotICAgICAgICAgICAgdmFyIGV4cHMgPSBbJ15c cyooKChbMC05QS1GYS1mXXsxLDR9Oil7N30oWzAtOUEtRmEtZl17MSw0fXw6KSl8JywKLSAgICAg ICAgICAgICAgJygoWzAtOUEtRmEtZl17MSw0fTopezZ9KDpbMC05QS1GYS1mXXsxLDR9fCgoMjVb MC01XXwnLAotICAgICAgICAgICAgICAnMlswLTRdXGR8MVxkXGR8WzEtOV0/XGQpKFwuKDI1WzAt NV18MlswLTRdXGR8MVxkXGR8WzEtOV0/XGQpKXszfSl8OikpfCcsCi0gICAgICAgICAgICAgICco KFswLTlBLUZhLWZdezEsNH06KXs1fSgoKDpbMC05QS1GYS1mXXsxLDR9KXsxLDJ9KXwnLAotICAg ICAgICAgICAgICAnOigoMjVbMC01XXwyWzAtNF1cZHwxXGRcZHxbMS05XT9cZCkoXC4oMjVbMC01 XXwyWzAtNF1cZHwxXGRcZHxbMS05XT9cZCkpezN9KXw6KSl8JywKLSAgICAgICAgICAgICAgJygo WzAtOUEtRmEtZl17MSw0fTopezR9KCgoOlswLTlBLUZhLWZdezEsNH0pezEsM30pfCgoOlswLTlB LUZhLWZdezEsNH0pPzooKDI1WzAtNV18JywKLSAgICAgICAgICAgICAgJzJbMC00XVxkfDFcZFxk fFsxLTldP1xkKShcLigyNVswLTVdfDJbMC00XVxkfDFcZFxkfFsxLTldP1xkKSl7M30pKXw6KSl8 JywKLSAgICAgICAgICAgICAgJygoWzAtOUEtRmEtZl17MSw0fTopezN9KCgoOlswLTlBLUZhLWZd ezEsNH0pezEsNH0pfCgoOlswLTlBLUZhLWZdezEsNH0pezAsMn06KCgyNVswLTVdfDJbMC00XVxk fDFcZFxkfCcsCi0gICAgICAgICAgICAgICdbMS05XT9cZCkoXC4oMjVbMC01XXwyWzAtNF1cZHwx XGRcZHxbMS05XT9cZCkpezN9KSl8OikpfCgoWzAtOUEtRmEtZl17MSw0fTopezJ9KCgoOlswLTlB LUZhLWZdezEsNH0pezEsNX0pfCcsCi0gICAgICAgICAgICAgICcoKDpbMC05QS1GYS1mXXsxLDR9 KXswLDN9OigoMjVbMC01XXwyWzAtNF1cZHwxXGRcZHxbMS05XT9cZCkoXC4oMjVbMC01XXwyWzAt NF1cZHwxXGRcZHxbMS05XT9cZCkpezN9KSl8OikpfCcsCi0gICAgICAgICAgICAgICcoKFswLTlB LUZhLWZdezEsNH06KXsxfSgoKDpbMC05QS1GYS1mXXsxLDR9KXsxLDZ9KXwoKDpbMC05QS1GYS1m XXsxLDR9KXswLDR9OigoMjVbMC01XXwyWzAtNF1cZHwnLAotICAgICAgICAgICAgICAnMVxkXGR8 WzEtOV0/XGQpKFwuKDI1WzAtNV18MlswLTRdXGR8MVxkXGR8WzEtOV0/XGQpKXszfSkpfDopKXwo OigoKDpbMC05QS1GYS1mXXsxLDR9KXsxLDd9KXwnLAotICAgICAgICAgICAgICAnKCg6WzAtOUEt RmEtZl17MSw0fSl7MCw1fTooKDI1WzAtNV18MlswLTRdXGR8MVxkXGR8WzEtOV0/XGQpKFwuKDI1 WzAtNV18MlswLTRdXGR8MVxkXGR8WzEtOV0/XGQpKXszfSkpfDopKSkoJS4rKT9ccyokJ107Ci0K LSAgICAgICAgICAgIHZhciBleHAgPSBuZXcgUmVnRXhwKGV4cHMuam9pbignJykpOwotICAgICAg ICAgICAgcmV0dXJuIGV4cC50ZXN0KHZhbC50cmltKCkpOwotICAgICAgICAgIH07Ci0gICAgICAg ICAgdmFyIGNoZWNrX2Zvcl92YWxpZF9pcCA9IGZ1bmN0aW9uKGlkLCBtc2cpIHsKLSAgICAgICAg ICAgIHZhciB2NGV4cHMgPSAnKF5cXHMqKCgoWzAtOV18WzEtOV1bMC05XXwxWzAtOV17Mn18Mlsw LTRdWzAtOV18MjVbMC01XSlcXC4pezN9KFswLTldfFsxLTldWzAtOV18MVswLTldezJ9fDJbMC00 XVswLTldfDI1WzAtNV0pKVxccyokKSc7Ci0gICAgICAgICAgICB2YXIgdjRleHAgPSBuZXcgUmVn RXhwKHY0ZXhwcyk7Ci0gICAgICAgICAgICB2YXIgdiA9IHNlbGYuZ2V0KGlkKTsKLSAgICAgICAg ICAgIGlmICgKLSAgICAgICAgICAgICAgdiAmJiAhKHY0ZXhwLnRlc3Qodi50cmltKCkpKQotICAg ICAgICAgICAgKSB7Ci0gICAgICAgICAgICAgIGlmKCFjaGVja19mb3JfdmFsaWRfaXB2Nih2KSl7 Ci0gICAgICAgICAgICAgICAgZXJyW2lkXSA9IG1zZzsKLSAgICAgICAgICAgICAgICBlcnJtc2cg PSBtc2c7Ci0gICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAg ICAgIHNlbGYuZXJyb3JNb2RlbC51bnNldChpZCk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAg fTsKLQotICAgICAgICAgIGlmICghc2VsZi5pc05ldygpICYmICdpZCcgaW4gc2VsZi5zZXNzQXR0 cnMpIHsKLSAgICAgICAgICAgIGVyclsnaWQnXSA9IGdldHRleHQoJ1RoZSBJRCBjYW5ub3QgYmUg Y2hhbmdlZC4nKTsKLSAgICAgICAgICAgIGVycm1zZyA9IGVyclsnaWQnXTsKLSAgICAgICAgICB9 IGVsc2UgewotICAgICAgICAgICAgc2VsZi5lcnJvck1vZGVsLnVuc2V0KCdpZCcpOwotICAgICAg ICAgIH0KLSAgICAgICAgICBjaGVja19mb3JfZW1wdHkoJ25hbWUnLCBnZXR0ZXh0KCdOYW1lIG11 c3QgYmUgc3BlY2lmaWVkLicpKTsKLQotICAgICAgICAgIC8vIElmIG5vIHNlcnZpY2UgaWQgdGhl biBvbmx5IGNoZWNrCi0gICAgICAgICAgaWYgKAotICAgICAgICAgICAgICBfLmlzVW5kZWZpbmVk KHNlcnZpY2VfaWQpIHx8IF8uaXNOdWxsKHNlcnZpY2VfaWQpIHx8Ci0gICAgICAgICAgICAgIFN0 cmluZyhzZXJ2aWNlX2lkKS5yZXBsYWNlKC9eXHMrfFxzKyQvZywgJycpID09ICcnCi0gICAgICAg ICAgICApIHsKLSAgICAgICAgICAgIGlmIChjaGVja19mb3JfZW1wdHkoCi0gICAgICAgICAgICAg ICdob3N0JywgZ2V0dGV4dCgnRWl0aGVyIEhvc3QgbmFtZSwgQWRkcmVzcyBvciBTZXJ2aWNlIG11 c3QgYmUgc3BlY2lmaWVkLicpCi0gICAgICAgICAgICApICYmIGNoZWNrX2Zvcl9lbXB0eSgnaG9z dGFkZHInLCBnZXR0ZXh0KCdFaXRoZXIgSG9zdCBuYW1lLCBBZGRyZXNzIG9yIFNlcnZpY2UgbXVz dCBiZSBzcGVjaWZpZWQuJykpKXsKLSAgICAgICAgICAgICAgZXJybXNnID0gZXJybXNnIHx8IGdl dHRleHQoJ0VpdGhlciBIb3N0IG5hbWUsIEFkZHJlc3Mgb3IgU2VydmljZSBtdXN0IGJlIHNwZWNp ZmllZC4nKTsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgIGVycm1zZyA9IHVu ZGVmaW5lZDsKLSAgICAgICAgICAgICAgZGVsZXRlIGVyclsnaG9zdCddOwotICAgICAgICAgICAg ICBkZWxldGUgZXJyWydob3N0YWRkciddOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBj aGVja19mb3JfZW1wdHkoCi0gICAgICAgICAgICAgICdkYicsIGdldHRleHQoJ01haW50ZW5hbmNl IGRhdGFiYXNlIG11c3QgYmUgc3BlY2lmaWVkLicpCi0gICAgICAgICAgICApOwotICAgICAgICAg ICAgY2hlY2tfZm9yX3ZhbGlkX2lwKAotICAgICAgICAgICAgICAnaG9zdGFkZHInLCBnZXR0ZXh0 KCdIb3N0IGFkZHJlc3MgbXVzdCBiZSB2YWxpZCBJUHY0IG9yIElQdjYgYWRkcmVzcy4nKQotICAg ICAgICAgICAgKTsKLSAgICAgICAgICAgIGNoZWNrX2Zvcl92YWxpZF9pcCgKLSAgICAgICAgICAg ICAgJ2hvc3RhZGRyJywgZ2V0dGV4dCgnSG9zdCBhZGRyZXNzIG11c3QgYmUgdmFsaWQgSVB2NCBv ciBJUHY2IGFkZHJlc3MuJykKLSAgICAgICAgICAgICk7Ci0gICAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgIF8uZWFjaChbJ2hvc3QnLCAnaG9zdGFkZHInLCAnZGInXSwgKGl0ZW0pID0+IHsK LSAgICAgICAgICAgICAgc2VsZi5lcnJvck1vZGVsLnVuc2V0KGl0ZW0pOwotICAgICAgICAgICAg fSk7Ci0gICAgICAgICAgfQotCi0gICAgICAgICAgY2hlY2tfZm9yX2VtcHR5KAotICAgICAgICAg ICAgJ3VzZXJuYW1lJywgZ2V0dGV4dCgnVXNlcm5hbWUgbXVzdCBiZSBzcGVjaWZpZWQuJykKLSAg ICAgICAgICApOwotICAgICAgICAgIGNoZWNrX2Zvcl9lbXB0eSgncG9ydCcsIGdldHRleHQoJ1Bv cnQgbXVzdCBiZSBzcGVjaWZpZWQuJykpOwotCi0gICAgICAgICAgdGhpcy5lcnJvck1vZGVsLnNl dChlcnIpOwotCi0gICAgICAgICAgaWYgKF8uc2l6ZShlcnIpKSB7Ci0gICAgICAgICAgICByZXR1 cm4gZXJybXNnOwotICAgICAgICAgIH0KLQotICAgICAgICAgIHJldHVybiBudWxsOworICAgICAg ICAgIGNvbnN0IHZhbGlkYXRlTW9kZWwgPSBuZXcgbW9kZWxWYWxpZGF0aW9uLk1vZGVsVmFsaWRh dGlvbih0aGlzKTsKKyAgICAgICAgICByZXR1cm4gdmFsaWRhdGVNb2RlbC52YWxpZGF0ZSgpOwog ICAgICAgICB9LAogICAgICAgICBpc0Nvbm5lY3RlZDogZnVuY3Rpb24obW9kZWwpIHsKICAgICAg ICAgICByZXR1cm4gbW9kZWwuZ2V0KCdjb25uZWN0ZWQnKTsKZGlmZiAtLWdpdCBhL3dlYi9wZ2Fk bWluL3N0YXRpYy9idW5kbGUvYnJvd3Nlci5qcyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9idW5kbGUv YnJvd3Nlci5qcwppbmRleCAzZmNjNjlkOC4uODNiMmFkOGIgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2Fk bWluL3N0YXRpYy9idW5kbGUvYnJvd3Nlci5qcworKysgYi93ZWIvcGdhZG1pbi9zdGF0aWMvYnVu ZGxlL2Jyb3dzZXIuanMKQEAgLTEsNiArMSw2IEBACiBkZWZpbmUoJ2J1bmRsZWRfYnJvd3Nlcics WwogICAncGdhZG1pbi5icm93c2VyJywKLSAgJ3NvdXJjZXMvYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvZGF0YWJhc2VzL2V4dGVybmFsX3RhYmxlcy9pbmRleCcsCisgICdzb3VyY2VzL2Jy b3dzZXIvaW5kZXgnLAogXSwgZnVuY3Rpb24ocGdCcm93c2VyKSB7CiAgIHBnQnJvd3Nlci5pbml0 KCk7CiB9KTsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9icm93c2VyL2luZGV4 LmpzIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2Jyb3dzZXIvaW5kZXguanMKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAuLjI5N2U4YmY5Ci0tLSAvZGV2L251bGwKKysrIGIvd2Vi L3BnYWRtaW4vc3RhdGljL2pzL2Jyb3dzZXIvaW5kZXguanMKQEAgLTAsMCArMSwxMCBAQAorLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v LworLy8KKy8vIHBnQWRtaW4gNCAtIFBvc3RncmVTUUwgVG9vbHMKKy8vCisvLyBDb3B5cmlnaHQg KEMpIDIwMTMgLSAyMDE4LCBUaGUgcGdBZG1pbiBEZXZlbG9wbWVudCBUZWFtCisvLyBUaGlzIHNv ZnR3YXJlIGlzIHJlbGVhc2VkIHVuZGVyIHRoZSBQb3N0Z3JlU1FMIExpY2VuY2UKKy8vCisvLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v LworCitpbXBvcnQgJ3NlcnZlcl9ncm91cHMnOwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3Rh dGljL2pzL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9pbmRleC5qcyBiL3dlYi9wZ2FkbWluL3N0YXRp Yy9qcy9icm93c2VyL3NlcnZlcl9ncm91cHMvaW5kZXguanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAuLmIxNTFiNmY2Ci0tLSAvZGV2L251bGwKKysrIGIvd2ViL3BnYWRtaW4v c3RhdGljL2pzL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9pbmRleC5qcwpAQCAtMCwwICsxLDEwIEBA CisvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vCisvLworLy8gcGdBZG1pbiA0IC0gUG9zdGdyZVNRTCBUb29scworLy8KKy8vIENvcHly aWdodCAoQykgMjAxMyAtIDIwMTgsIFRoZSBwZ0FkbWluIERldmVsb3BtZW50IFRlYW0KKy8vIFRo aXMgc29mdHdhcmUgaXMgcmVsZWFzZWQgdW5kZXIgdGhlIFBvc3RncmVTUUwgTGljZW5jZQorLy8K Ky8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vCisKK2ltcG9ydCAnc2VydmVycyc7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0 aWMvanMvYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2luZGV4LmpzIGIv d2ViL3BnYWRtaW4vc3RhdGljL2pzL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFi YXNlcy9pbmRleC5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMC4uZWYxN2Mw YWQKLS0tIC9kZXYvbnVsbAorKysgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2luZGV4LmpzCkBAIC0wLDAgKzEsMTAgQEAKKy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8KKy8vCisvLyBwZ0FkbWluIDQgLSBQb3N0Z3JlU1FMIFRvb2xzCisvLworLy8gQ29weXJpZ2h0 IChDKSAyMDEzIC0gMjAxOCwgVGhlIHBnQWRtaW4gRGV2ZWxvcG1lbnQgVGVhbQorLy8gVGhpcyBz b2Z0d2FyZSBpcyByZWxlYXNlZCB1bmRlciB0aGUgUG9zdGdyZVNRTCBMaWNlbmNlCisvLworLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8KKworaW1wb3J0ICdleHRlcm5hbF90YWJsZXMnOwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4v c3RhdGljL2pzL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2luZGV4LmpzIGIvd2ViL3Bn YWRtaW4vc3RhdGljL2pzL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2luZGV4LmpzCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwLi4yNDJhMTkxOQotLS0gL2Rldi9udWxs CisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9pbmRleC5qcwpAQCAtMCwwICsxLDExIEBACisvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisvLworLy8gcGdBZG1pbiA0IC0gUG9z dGdyZVNRTCBUb29scworLy8KKy8vIENvcHlyaWdodCAoQykgMjAxMyAtIDIwMTgsIFRoZSBwZ0Fk bWluIERldmVsb3BtZW50IFRlYW0KKy8vIFRoaXMgc29mdHdhcmUgaXMgcmVsZWFzZWQgdW5kZXIg dGhlIFBvc3RncmVTUUwgTGljZW5jZQorLy8KKy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisKK2ltcG9ydCAnZGF0YWJhc2VzJzsK K2ltcG9ydCAnbW9kZWxfdmFsaWRhdGlvbic7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0 aWMvanMvYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvbW9kZWxfdmFsaWRhdGlvbi5qcyBi L3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9tb2Rl bF92YWxpZGF0aW9uLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwLi43YWIx MjliYQotLS0gL2Rldi9udWxsCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9icm93c2VyL3Nl cnZlcl9ncm91cHMvc2VydmVycy9tb2RlbF92YWxpZGF0aW9uLmpzCkBAIC0wLDAgKzEsMTA0IEBA CisvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vCisvLworLy8gcGdBZG1pbiA0IC0gUG9zdGdyZVNRTCBUb29scworLy8KKy8vIENvcHly aWdodCAoQykgMjAxMyAtIDIwMTgsIFRoZSBwZ0FkbWluIERldmVsb3BtZW50IFRlYW0KKy8vIFRo aXMgc29mdHdhcmUgaXMgcmVsZWFzZWQgdW5kZXIgdGhlIFBvc3RncmVTUUwgTGljZW5jZQorLy8K Ky8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vCisKK2ltcG9ydCBnZXR0ZXh0IGZyb20gJ3NvdXJjZXMvZ2V0dGV4dCc7CitpbXBvcnQg XyBmcm9tICd1bmRlcnNjb3JlJzsKK2ltcG9ydCB7QWRkcmVzczQsIEFkZHJlc3M2fSBmcm9tICdp cC1hZGRyZXNzJzsKKworZXhwb3J0IGNsYXNzIE1vZGVsVmFsaWRhdGlvbiB7CisgIGNvbnN0cnVj dG9yKG1vZGVsKSB7CisgICAgdGhpcy5lcnIgPSB7fTsKKyAgICB0aGlzLmVycm1zZyA9ICcnOwor ICAgIHRoaXMubW9kZWwgPSBtb2RlbDsKKyAgfQorCisgIHZhbGlkYXRlKCkgeworICAgIGNvbnN0 IHNlcnZpY2VJZCA9IHRoaXMubW9kZWwuZ2V0KCdzZXJ2aWNlJyk7CisKKyAgICBpZiAoIXRoaXMu bW9kZWwuaXNOZXcoKSAmJiAnaWQnIGluIHRoaXMubW9kZWwuc2Vzc0F0dHJzKSB7CisgICAgICB0 aGlzLmVyclsnaWQnXSA9IGdldHRleHQoJ1RoZSBJRCBjYW5ub3QgYmUgY2hhbmdlZC4nKTsKKyAg ICAgIHRoaXMuZXJybXNnID0gdGhpcy5lcnJbJ2lkJ107CisgICAgfSBlbHNlIHsKKyAgICAgIHRo aXMubW9kZWwuZXJyb3JNb2RlbC51bnNldCgnaWQnKTsKKyAgICB9CisKKyAgICB0aGlzLmNoZWNr Rm9yRW1wdHkoJ25hbWUnLCBnZXR0ZXh0KCdOYW1lIG11c3QgYmUgc3BlY2lmaWVkLicpKTsKKwor ICAgIGlmIChNb2RlbFZhbGlkYXRpb24uaXNFbXB0eVN0cmluZyhzZXJ2aWNlSWQpKSB7CisgICAg ICB0aGlzLmNoZWNrSG9zdEFuZEhvc3RBZGRyZXNzKCk7CisKKyAgICAgIHRoaXMuY2hlY2tGb3JF bXB0eSgnZGInLCBnZXR0ZXh0KCdNYWludGVuYW5jZSBkYXRhYmFzZSBtdXN0IGJlIHNwZWNpZmll ZC4nKSk7CisgICAgfSBlbHNlIHsKKyAgICAgIHRoaXMuY2xlYXJIb3N0QWRkcmVzc0FuZERiRXJy b3JzKCk7CisgICAgfQorCisgICAgdGhpcy5jaGVja0ZvckVtcHR5KCd1c2VybmFtZScsIGdldHRl eHQoJ1VzZXJuYW1lIG11c3QgYmUgc3BlY2lmaWVkLicpKTsKKyAgICB0aGlzLmNoZWNrRm9yRW1w dHkoJ3BvcnQnLCBnZXR0ZXh0KCdQb3J0IG11c3QgYmUgc3BlY2lmaWVkLicpKTsKKworICAgIHRo aXMubW9kZWwuZXJyb3JNb2RlbC5zZXQodGhpcy5lcnIpOworCisgICAgaWYgKF8uc2l6ZSh0aGlz LmVycikpIHsKKyAgICAgIHJldHVybiB0aGlzLmVycm1zZzsKKyAgICB9CisKKyAgICByZXR1cm4g bnVsbDsKKyAgfQorCisgIGNsZWFySG9zdEFkZHJlc3NBbmREYkVycm9ycygpIHsKKyAgICBfLmVh Y2goWydob3N0JywgJ2hvc3RhZGRyJywgJ2RiJ10sIChpdGVtKSA9PiB7CisgICAgICB0aGlzLm1v ZGVsLmVycm9yTW9kZWwudW5zZXQoaXRlbSk7CisgICAgfSk7CisgIH0KKworICBjaGVja0hvc3RB bmRIb3N0QWRkcmVzcygpIHsKKyAgICBjb25zdCB0cmFuc2xhdGVkU3RyID0gZ2V0dGV4dCgnRWl0 aGVyIEhvc3QgbmFtZSwgQWRkcmVzcyBvciBTZXJ2aWNlIG11c3QgJyArCisgICAgICAnYmUgc3Bl Y2lmaWVkLicpOworICAgIGlmICh0aGlzLmNoZWNrRm9yRW1wdHkoJ2hvc3QnLCB0cmFuc2xhdGVk U3RyKSAmJgorICAgICAgdGhpcy5jaGVja0ZvckVtcHR5KCdob3N0YWRkcicsIHRyYW5zbGF0ZWRT dHIpKSB7CisgICAgICB0aGlzLmVycm1zZyA9IHRoaXMuZXJybXNnIHx8IHRyYW5zbGF0ZWRTdHI7 CisgICAgfSBlbHNlIHsKKyAgICAgIHRoaXMuZXJybXNnID0gdW5kZWZpbmVkOworICAgICAgZGVs ZXRlIHRoaXMuZXJyWydob3N0J107CisgICAgICBkZWxldGUgdGhpcy5lcnJbJ2hvc3RhZGRyJ107 CisgICAgfQorCisgICAgdGhpcy5jaGVja0ZvclZhbGlkSXAodGhpcy5tb2RlbC5nZXQoJ2hvc3Rh ZGRyJyksCisgICAgICBnZXR0ZXh0KCdIb3N0IGFkZHJlc3MgbXVzdCBiZSB2YWxpZCBJUHY0IG9y IElQdjYgYWRkcmVzcy4nKSk7CisgIH0KKworICBjaGVja0ZvclZhbGlkSXAoaXBBZGRyZXNzLCBt c2cpIHsKKyAgICBpZiAoaXBBZGRyZXNzKSB7CisgICAgICBjb25zdCBpc0lwdjZBZGRyZXNzID0g bmV3IEFkZHJlc3M2KGlwQWRkcmVzcykuaXNWYWxpZCgpOworICAgICAgY29uc3QgaXNJcHY0QWRk cmVzcyA9IG5ldyBBZGRyZXNzNChpcEFkZHJlc3MpLmlzVmFsaWQoKTsKKyAgICAgIGlmICghaXNJ cHY0QWRkcmVzcyAmJiAhaXNJcHY2QWRkcmVzcykgeworICAgICAgICB0aGlzLmVyclsnaG9zdGFk ZHInXSA9IG1zZzsKKyAgICAgICAgdGhpcy5lcnJtc2cgPSBtc2c7CisgICAgICB9CisgICAgfSBl bHNlIHsKKyAgICAgIHRoaXMubW9kZWwuZXJyb3JNb2RlbC51bnNldCgnaG9zdGFkZHInKTsKKyAg ICB9CisgIH0KKworICBjaGVja0ZvckVtcHR5KGlkLCBtc2cpIHsKKyAgICBjb25zdCB2YWx1ZSA9 IHRoaXMubW9kZWwuZ2V0KGlkKTsKKworICAgIGlmIChNb2RlbFZhbGlkYXRpb24uaXNFbXB0eVN0 cmluZyh2YWx1ZSkpIHsKKyAgICAgIHRoaXMuZXJyW2lkXSA9IG1zZzsKKyAgICAgIHRoaXMuZXJy bXNnID0gdGhpcy5lcnJtc2cgfHwgbXNnOworICAgICAgcmV0dXJuIHRydWU7CisgICAgfSBlbHNl IHsKKyAgICAgIHRoaXMubW9kZWwuZXJyb3JNb2RlbC51bnNldChpZCk7CisgICAgICByZXR1cm4g ZmFsc2U7CisgICAgfQorICB9CisKKyAgc3RhdGljIGlzRW1wdHlTdHJpbmcoc3RyaW5nKSB7Cisg ICAgcmV0dXJuIF8uaXNVbmRlZmluZWQoc3RyaW5nKSB8fCBfLmlzTnVsbChzdHJpbmcpIHx8IHN0 cmluZy50cmltKCkgPT09ICcnOworICB9Cit9CmRpZmYgLS1naXQgYS93ZWIvcmVncmVzc2lvbi9q YXZhc2NyaXB0L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL21vZGVsX3ZhbGlkYXRpb25f c3BlYy5qcyBiL3dlYi9yZWdyZXNzaW9uL2phdmFzY3JpcHQvYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvbW9kZWxfdmFsaWRhdGlvbl9zcGVjLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwLi5hMDVjZDQ1NQotLS0gL2Rldi9udWxsCisrKyBiL3dlYi9yZWdyZXNzaW9u L2phdmFzY3JpcHQvYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvbW9kZWxfdmFsaWRhdGlv bl9zcGVjLmpzCkBAIC0wLDAgKzEsMTAxIEBACisvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisvLworLy8gcGdBZG1pbiA0IC0gUG9z dGdyZVNRTCBUb29scworLy8KKy8vIENvcHlyaWdodCAoQykgMjAxMyAtIDIwMTgsIFRoZSBwZ0Fk bWluIERldmVsb3BtZW50IFRlYW0KKy8vIFRoaXMgc29mdHdhcmUgaXMgcmVsZWFzZWQgdW5kZXIg dGhlIFBvc3RncmVTUUwgTGljZW5jZQorLy8KKy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisKK2ltcG9ydCB7TW9kZWxWYWxpZGF0 aW9ufSBmcm9tICdzb3VyY2VzL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL21vZGVsX3Zh bGlkYXRpb24nOworCitkZXNjcmliZSgnU2VydmVyI01vZGVsVmFsaWRhdGlvbicsICgpID0+IHsK KyAgZGVzY3JpYmUoJ1doZW4gdmFsaWRhdGluZyBhIHNlcnZlciBwYXJhbWV0ZXJzJywgKCkgPT4g eworICAgIGxldCBtb2RlbDsKKyAgICBsZXQgbW9kZWxWYWxpZGF0aW9uOworICAgIGJlZm9yZUVh Y2goKCkgPT4geworICAgICAgbW9kZWwgPSB7CisgICAgICAgIGVycm9yTW9kZWw6IGphc21pbmUu Y3JlYXRlU3B5T2JqKCdlcnJvck1vZGVsJywgWydzZXQnLCAndW5zZXQnXSksCisgICAgICAgIGFs bFZhbHVlczoge30sCisgICAgICAgIGdldDogZnVuY3Rpb24gKGtleSkgeworICAgICAgICAgIHJl dHVybiB0aGlzLmFsbFZhbHVlc1trZXldOworICAgICAgICB9LAorICAgICAgICBzZXNzQXR0cnM6 IHt9LAorICAgICAgfTsKKyAgICAgIG1vZGVsLmlzTmV3ID0gamFzbWluZS5jcmVhdGVTcHkoJ2lz TmV3Jyk7CisgICAgICBtb2RlbFZhbGlkYXRpb24gPSBuZXcgTW9kZWxWYWxpZGF0aW9uKG1vZGVs KTsKKyAgICB9KTsKKworICAgIGRlc2NyaWJlKCdXaGVuIGFsbCBwYXJhbWV0ZXJzIGFyZSB2YWxp ZCcsICgpID0+IHsKKyAgICAgIGJlZm9yZUVhY2goKCkgPT4geworICAgICAgICBtb2RlbC5pc05l dy5hbmQucmV0dXJuVmFsdWUodHJ1ZSk7CisgICAgICAgIG1vZGVsLmFsbFZhbHVlc1snbmFtZSdd ID0gJ3NvbWUgbmFtZSc7CisgICAgICAgIG1vZGVsLmFsbFZhbHVlc1sndXNlcm5hbWUnXSA9ICdz b21lIHVzZXJuYW1lJzsKKyAgICAgICAgbW9kZWwuYWxsVmFsdWVzWydwb3J0J10gPSAnc29tZSBw b3J0JzsKKyAgICAgIH0pOworCisgICAgICBkZXNjcmliZSgnTm8gc2VydmljZSBpZCcsICgpID0+ IHsKKyAgICAgICAgaXQoJ2RvZXMgbm90IHNldCBhbnkgZXJyb3IgaW4gdGhlIG1vZGVsJywgKCkg PT4geworICAgICAgICAgIG1vZGVsLmFsbFZhbHVlc1snaG9zdCddID0gJ3NvbWUgaG9zdCc7Cisg ICAgICAgICAgbW9kZWwuYWxsVmFsdWVzWydkYiddID0gJ3NvbWUgZGInOworICAgICAgICAgIG1v ZGVsLmFsbFZhbHVlc1snaG9zdGFkZHInXSA9ICcxLjEuMS4xJzsKKyAgICAgICAgICBleHBlY3Qo bW9kZWxWYWxpZGF0aW9uLnZhbGlkYXRlKCkpLnRvQmVOdWxsKCk7CisgICAgICAgICAgZXhwZWN0 KG1vZGVsLmVycm9yTW9kZWwuc2V0KS50b0hhdmVCZWVuQ2FsbGVkV2l0aCh7fSk7CisgICAgICAg IH0pOworICAgICAgfSk7CisKKyAgICAgIGRlc2NyaWJlKCdTZXJ2aWNlIGlkIHByZXNlbnQnLCAo KSA9PiB7CisgICAgICAgIGl0KCdkb2VzIG5vdCBzZXQgYW55IGVycm9yIGluIHRoZSBtb2RlbCcs ICgpID0+IHsKKyAgICAgICAgICBtb2RlbC5hbGxWYWx1ZXNbJ3NlcnZpY2UnXSA9ICdhc2RmZyc7 CisgICAgICAgICAgZXhwZWN0KG1vZGVsVmFsaWRhdGlvbi52YWxpZGF0ZSgpKS50b0JlTnVsbCgp OworICAgICAgICAgIGV4cGVjdChtb2RlbC5lcnJvck1vZGVsLnNldCkudG9IYXZlQmVlbkNhbGxl ZFdpdGgoe30pOworICAgICAgICB9KTsKKyAgICAgIH0pOworICAgIH0pOworCisgICAgZGVzY3Jp YmUoJ1doZW4gbm8gcGFyYW1ldGVycyBhcmUgdmFsaWQnLCAoKSA9PiB7CisgICAgICBkZXNjcmli ZSgnU2VydmljZSBpZCBub3QgcHJlc2VudCcsICgpID0+IHsKKyAgICAgICAgaXQoJ2RvZXMgbm90 IHNldCBhbnkgZXJyb3IgaW4gdGhlIG1vZGVsJywgKCkgPT4geworICAgICAgICAgIGV4cGVjdCht b2RlbFZhbGlkYXRpb24udmFsaWRhdGUoKSkudG9CZSgnTmFtZSBtdXN0IGJlIHNwZWNpZmllZC4n KTsKKyAgICAgICAgICBleHBlY3QobW9kZWwuZXJyb3JNb2RlbC5zZXQpLnRvSGF2ZUJlZW5DYWxs ZWRUaW1lcygxKTsKKyAgICAgICAgICBleHBlY3QobW9kZWwuZXJyb3JNb2RlbC5zZXQpLnRvSGF2 ZUJlZW5DYWxsZWRXaXRoKHsKKyAgICAgICAgICAgIG5hbWU6ICdOYW1lIG11c3QgYmUgc3BlY2lm aWVkLicsCisgICAgICAgICAgICBob3N0OiAnRWl0aGVyIEhvc3QgbmFtZSwgQWRkcmVzcyBvciBT ZXJ2aWNlIG11c3QgYmUgc3BlY2lmaWVkLicsCisgICAgICAgICAgICBob3N0YWRkcjogJ0VpdGhl ciBIb3N0IG5hbWUsIEFkZHJlc3Mgb3IgU2VydmljZSBtdXN0IGJlIHNwZWNpZmllZC4nLAorICAg ICAgICAgICAgZGI6ICdNYWludGVuYW5jZSBkYXRhYmFzZSBtdXN0IGJlIHNwZWNpZmllZC4nLAor ICAgICAgICAgICAgdXNlcm5hbWU6ICdVc2VybmFtZSBtdXN0IGJlIHNwZWNpZmllZC4nLAorICAg ICAgICAgICAgcG9ydDogJ1BvcnQgbXVzdCBiZSBzcGVjaWZpZWQuJworICAgICAgICAgIH0pOwor ICAgICAgICB9KTsKKyAgICAgIH0pOworCisgICAgICBkZXNjcmliZSgnSG9zdCBhZGRyZXNzIGlz IG5vdCB2YWxpZCcsICgpID0+IHsKKyAgICAgICAgaXQoJ3NldHMgdGhlICJIb3N0IGFkZHJlc3Mg bXVzdCBiZSBhIHZhbGlkIElQdjQgb3IgSVB2NiBhZGRyZXNzIiBlcnJvcicsICgpID0+IHsKKyAg ICAgICAgICBtb2RlbC5hbGxWYWx1ZXNbJ2hvc3RhZGRyJ10gPSAnc29tZXRoaW5nIHRoYXQgaXMg bm90IGFuIGlwIGFkZHJlc3MnOworICAgICAgICAgIGV4cGVjdChtb2RlbFZhbGlkYXRpb24udmFs aWRhdGUoKSkudG9CZSgnSG9zdCBhZGRyZXNzIG11c3QgYmUgdmFsaWQgSVB2NCBvciBJUHY2IGFk ZHJlc3MuJyk7CisgICAgICAgICAgZXhwZWN0KG1vZGVsLmVycm9yTW9kZWwuc2V0KS50b0hhdmVC ZWVuQ2FsbGVkVGltZXMoMSk7CisgICAgICAgICAgZXhwZWN0KG1vZGVsLmVycm9yTW9kZWwuc2V0 KS50b0hhdmVCZWVuQ2FsbGVkV2l0aCh7CisgICAgICAgICAgICBuYW1lOiAnTmFtZSBtdXN0IGJl IHNwZWNpZmllZC4nLAorICAgICAgICAgICAgaG9zdGFkZHI6ICdIb3N0IGFkZHJlc3MgbXVzdCBi ZSB2YWxpZCBJUHY0IG9yIElQdjYgYWRkcmVzcy4nLAorICAgICAgICAgICAgZGI6ICdNYWludGVu YW5jZSBkYXRhYmFzZSBtdXN0IGJlIHNwZWNpZmllZC4nLAorICAgICAgICAgICAgdXNlcm5hbWU6 ICdVc2VybmFtZSBtdXN0IGJlIHNwZWNpZmllZC4nLAorICAgICAgICAgICAgcG9ydDogJ1BvcnQg bXVzdCBiZSBzcGVjaWZpZWQuJworICAgICAgICAgIH0pOworICAgICAgICB9KTsKKyAgICAgIH0p OworCisgICAgICBkZXNjcmliZSgnU2VydmljZSBpZCBwcmVzZW50JywgKCkgPT4geworICAgICAg ICBpdCgnZG9lcyBub3Qgc2V0IGFueSBlcnJvciBpbiB0aGUgbW9kZWwnLCAoKSA9PiB7CisgICAg ICAgICAgbW9kZWwuYWxsVmFsdWVzWydzZXJ2aWNlJ10gPSAnYXNkZmcnOworICAgICAgICAgIGV4 cGVjdChtb2RlbFZhbGlkYXRpb24udmFsaWRhdGUoKSkudG9CZSgnTmFtZSBtdXN0IGJlIHNwZWNp ZmllZC4nKTsKKyAgICAgICAgICBleHBlY3QobW9kZWwuZXJyb3JNb2RlbC5zZXQpLnRvSGF2ZUJl ZW5DYWxsZWRUaW1lcygxKTsKKyAgICAgICAgICBleHBlY3QobW9kZWwuZXJyb3JNb2RlbC5zZXQp LnRvSGF2ZUJlZW5DYWxsZWRXaXRoKHsKKyAgICAgICAgICAgIG5hbWU6ICdOYW1lIG11c3QgYmUg c3BlY2lmaWVkLicsCisgICAgICAgICAgICB1c2VybmFtZTogJ1VzZXJuYW1lIG11c3QgYmUgc3Bl Y2lmaWVkLicsCisgICAgICAgICAgICBwb3J0OiAnUG9ydCBtdXN0IGJlIHNwZWNpZmllZC4nCisg ICAgICAgICAgfSk7CisgICAgICAgIH0pOworICAgICAgfSk7CisgICAgfSk7CisgIH0pOworfSk7 CmRpZmYgLS1naXQgYS93ZWIveWFybi5sb2NrIGIvd2ViL3lhcm4ubG9jawppbmRleCA4NWNjYmM4 Yi4uMmRjNGM1YzIgMTAwNjQ0Ci0tLSBhL3dlYi95YXJuLmxvY2sKKysrIGIvd2ViL3lhcm4ubG9j awpAQCAtMzkzOCw2ICszOTM4LDE4IEBAIGludmVydC1rdkBeMS4wLjA6CiAgIHZlcnNpb24gIjEu MC4wIgogICByZXNvbHZlZCAiaHR0cHM6Ly9yZWdpc3RyeS55YXJucGtnLmNvbS9pbnZlcnQta3Yv LS9pbnZlcnQta3YtMS4wLjAudGd6IzEwNGE4ZTRhYWNhNmQzZDhjZDE1N2E4ZWY4YmZhYjJkN2Ez ZmZkYjYiCiAKK2lwLWFkZHJlc3NAXjUuOC45OgorICB2ZXJzaW9uICI1LjguOSIKKyAgcmVzb2x2 ZWQgImh0dHBzOi8vcmVnaXN0cnkueWFybnBrZy5jb20vaXAtYWRkcmVzcy8tL2lwLWFkZHJlc3Mt NS44LjkudGd6IzYzNzkyNzdjMjNmYzVhZGIyMDUxMWU0ZDIzZWMyYzFiZGUxMDVkZmQiCisgIGRl cGVuZGVuY2llczoKKyAgICBqc2JuICIxLjEuMCIKKyAgICBsb2Rhc2guZmluZCAiXjQuNi4wIgor ICAgIGxvZGFzaC5tYXggIl40LjAuMSIKKyAgICBsb2Rhc2gubWVyZ2UgIl40LjYuMCIKKyAgICBs b2Rhc2gucGFkc3RhcnQgIl40LjYuMSIKKyAgICBsb2Rhc2gucmVwZWF0ICJeNC4xLjAiCisgICAg c3ByaW50Zi1qcyAiMS4xLjAiCisKIGlwLXJlZ2V4QF4xLjAuMToKICAgdmVyc2lvbiAiMS4wLjMi CiAgIHJlc29sdmVkICJodHRwczovL3JlZ2lzdHJ5Lnlhcm5wa2cuY29tL2lwLXJlZ2V4Ly0vaXAt cmVnZXgtMS4wLjMudGd6I2RjNTg5MDc2ZjY1OWY0MTljMjIyMDM5YTMzMzE2ZjFjNzM4N2VmZmQi CkBAIC00MzI5LDYgKzQzNDEsMTAgQEAganMteWFtbEB+My43LjA6CiAgICAgYXJncGFyc2UgIl4x LjAuNyIKICAgICBlc3ByaW1hICJeMi42LjAiCiAKK2pzYm5AMS4xLjA6CisgIHZlcnNpb24gIjEu MS4wIgorICByZXNvbHZlZCAiaHR0cHM6Ly9yZWdpc3RyeS55YXJucGtnLmNvbS9qc2JuLy0vanNi bi0xLjEuMC50Z3ojYjAxMzA3Y2IyOWI2MThhMWVkMjZlYzc5ZTkxMWY4MDNjNGRhMDA0MCIKKwog anNibkB+MC4xLjA6CiAgIHZlcnNpb24gIjAuMS4xIgogICByZXNvbHZlZCAiaHR0cHM6Ly9yZWdp c3RyeS55YXJucGtnLmNvbS9qc2JuLy0vanNibi0wLjEuMS50Z3ojYTVlNjU0YzJlNWEyZGViNWYy MDFkOTZjZWZiY2E4MGMwZWYyZjUxMyIKQEAgLTQ3MzgsNiArNDc1NCwxMCBAQCBsb2Rhc2guZXNj YXBlQF4zLjAuMDoKICAgZGVwZW5kZW5jaWVzOgogICAgIGxvZGFzaC5fcm9vdCAiXjMuMC4wIgog Citsb2Rhc2guZmluZEBeNC42LjA6CisgIHZlcnNpb24gIjQuNi4wIgorICByZXNvbHZlZCAiaHR0 cHM6Ly9yZWdpc3RyeS55YXJucGtnLmNvbS9sb2Rhc2guZmluZC8tL2xvZGFzaC5maW5kLTQuNi4w LnRneiNjYjA3MDRkNDdhYjcxNzg5ZmZhMGRlOGI5N2RkOTI2ZmI4OGIxM2IxIgorCiBsb2Rhc2gu ZmxhdHRlbmRlZXBAXjQuNC4wOgogICB2ZXJzaW9uICI0LjQuMCIKICAgcmVzb2x2ZWQgImh0dHBz Oi8vcmVnaXN0cnkueWFybnBrZy5jb20vbG9kYXNoLmZsYXR0ZW5kZWVwLy0vbG9kYXNoLmZsYXR0 ZW5kZWVwLTQuNC4wLnRneiNmYjAzMDkxN2Y4NmEzMTM0ZTViYzliZWMwZDY5ZTAwMTNkZGZlZGIy IgpAQCAtNDc3Nyw2ICs0Nzk3LDEwIEBAIGxvZGFzaC5rZXlzQF4zLjAuMDoKICAgICBsb2Rhc2gu aXNhcmd1bWVudHMgIl4zLjAuMCIKICAgICBsb2Rhc2guaXNhcnJheSAiXjMuMC4wIgogCitsb2Rh c2gubWF4QF40LjAuMToKKyAgdmVyc2lvbiAiNC4wLjEiCisgIHJlc29sdmVkICJodHRwczovL3Jl Z2lzdHJ5Lnlhcm5wa2cuY29tL2xvZGFzaC5tYXgvLS9sb2Rhc2gubWF4LTQuMC4xLnRneiM4NzM1 NTY2YzYxOGIzNWE5Zjc2MDUyMGI0ODdhZTc5NjU4YWYxMzZhIgorCiBsb2Rhc2gubWVtb2l6ZUBe NC4xLjI6CiAgIHZlcnNpb24gIjQuMS4yIgogICByZXNvbHZlZCAiaHR0cHM6Ly9yZWdpc3RyeS55 YXJucGtnLmNvbS9sb2Rhc2gubWVtb2l6ZS8tL2xvZGFzaC5tZW1vaXplLTQuMS4yLnRneiNiY2M2 YzQ5YTQyYTI4NDBlZDk5N2YzMjNlYWRhNWVjZDE4MmUwYmZlIgpAQCAtNDc4NSwxMCArNDgwOSwy MiBAQCBsb2Rhc2gubWVtb2l6ZUB+My4wLjM6CiAgIHZlcnNpb24gIjMuMC40IgogICByZXNvbHZl ZCAiaHR0cHM6Ly9yZWdpc3RyeS55YXJucGtnLmNvbS9sb2Rhc2gubWVtb2l6ZS8tL2xvZGFzaC5t ZW1vaXplLTMuMC40LnRneiMyZGNiZDJjMjg3Y2JjMGE1NWNjNDIzMjhiZDBjNzM2MTUwZDUzZTNm IgogCitsb2Rhc2gubWVyZ2VAXjQuNi4wOgorICB2ZXJzaW9uICI0LjYuMSIKKyAgcmVzb2x2ZWQg Imh0dHBzOi8vcmVnaXN0cnkueWFybnBrZy5jb20vbG9kYXNoLm1lcmdlLy0vbG9kYXNoLm1lcmdl LTQuNi4xLnRneiNhZGMyNWQ5Y2I5OWI5MzkxYzU5NjI0ZjM3OWZiYmE2MGQ3MTExZDU0IgorCiBs b2Rhc2gubWVyZ2V3aXRoQF40LjYuMDoKICAgdmVyc2lvbiAiNC42LjAiCiAgIHJlc29sdmVkICJo dHRwczovL3JlZ2lzdHJ5Lnlhcm5wa2cuY29tL2xvZGFzaC5tZXJnZXdpdGgvLS9sb2Rhc2gubWVy Z2V3aXRoLTQuNi4wLnRneiMxNTBjZjBhMTY3OTFmNTkwM2I4ODkxZWFiMTU0NjA5Mjc0YmRlYTU1 IgogCitsb2Rhc2gucGFkc3RhcnRAXjQuNi4xOgorICB2ZXJzaW9uICI0LjYuMSIKKyAgcmVzb2x2 ZWQgImh0dHBzOi8vcmVnaXN0cnkueWFybnBrZy5jb20vbG9kYXNoLnBhZHN0YXJ0Ly0vbG9kYXNo LnBhZHN0YXJ0LTQuNi4xLnRneiNkMmUzZWViZmYwZDlkMzlhZDUwZjVjYmQxYjUyYTdiY2U2YmI2 MTFiIgorCitsb2Rhc2gucmVwZWF0QF40LjEuMDoKKyAgdmVyc2lvbiAiNC4xLjAiCisgIHJlc29s dmVkICJodHRwczovL3JlZ2lzdHJ5Lnlhcm5wa2cuY29tL2xvZGFzaC5yZXBlYXQvLS9sb2Rhc2gu cmVwZWF0LTQuMS4wLnRneiNmYzdkZTgxMzFkOGM4YWMwN2U0YjQ5Zjc0ZmZlODI5ZDFmMmJlYzQ0 IgorCiBsb2Rhc2gucmVzdHBhcmFtQF4zLjAuMDoKICAgdmVyc2lvbiAiMy42LjEiCiAgIHJlc29s dmVkICJodHRwczovL3JlZ2lzdHJ5Lnlhcm5wa2cuY29tL2xvZGFzaC5yZXN0cGFyYW0vLS9sb2Rh c2gucmVzdHBhcmFtLTMuNi4xLnRneiM5MzZhNGUzMDllZjMzMGE3NjQ1ZWQ0MTQ1OTg2Yzg1YWU1 YjIwODA1IgpAQCAtNjg2Myw2ICs2ODk5LDEwIEBAIHNwZWN0cnVtLWNvbG9ycGlja2VyQF4xLjgu MDoKICAgdmVyc2lvbiAiMS44LjAiCiAgIHJlc29sdmVkICJodHRwczovL3JlZ2lzdHJ5Lnlhcm5w a2cuY29tL3NwZWN0cnVtLWNvbG9ycGlja2VyLy0vc3BlY3RydW0tY29sb3JwaWNrZXItMS44LjAu dGd6I2I5MjZjZjUwMDJjMGE3Nzg2MGI1ZjgzNTFlMWMwOTNjNjUyMDAxMDciCiAKK3NwcmludGYt anNAMS4xLjA6CisgIHZlcnNpb24gIjEuMS4wIgorICByZXNvbHZlZCAiaHR0cHM6Ly9yZWdpc3Ry eS55YXJucGtnLmNvbS9zcHJpbnRmLWpzLy0vc3ByaW50Zi1qcy0xLjEuMC50Z3ojY2ZmY2FmNzAy ZGFmNjVlYTM5YmI0ZTBmYTJiMjk5Y2VjMWExYmU0NiIKKwogc3ByaW50Zi1qc0BeMS4wLjM6CiAg IHZlcnNpb24gIjEuMS4xIgogICByZXNvbHZlZCAiaHR0cHM6Ly9yZWdpc3RyeS55YXJucGtnLmNv bS9zcHJpbnRmLWpzLy0vc3ByaW50Zi1qcy0xLjEuMS50Z3ojMzZiZTc4MzIwYWZlNTgwMWY2Y2Vh M2VlNzhiNmU1YWFiOTQwZWEwYyIK --001a114c053cb9427705674b9545 Content-Type: text/x-patch; charset="US-ASCII"; name="revert-upgrade-of-jasmine.diff" Content-Disposition: attachment; filename="revert-upgrade-of-jasmine.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jeppo2sa1 ZGlmZiAtLWdpdCBhL3dlYi9wYWNrYWdlLmpzb24gYi93ZWIvcGFja2FnZS5qc29uCmluZGV4IGE0 Y2I1OGQ1Li5hZDBmM2UxNiAxMDA2NDQKLS0tIGEvd2ViL3BhY2thZ2UuanNvbgorKysgYi93ZWIv cGFja2FnZS5qc29uCkBAIC0xOCw3ICsxOCw3IEBACiAgICAgImZpbGUtbG9hZGVyIjogIl4wLjEx LjIiLAogICAgICJpbWFnZS13ZWJwYWNrLWxvYWRlciI6ICJeMy4zLjEiLAogICAgICJpcy1kb2Nr ZXIiOiAiXjEuMS4wIiwKLSAgICAiamFzbWluZS1jb3JlIjogIn4zLjEuMCIsCisgICAgImphc21p bmUtY29yZSI6ICJ+Mi45OS4wIiwKICAgICAiamFzbWluZS1lbnp5bWUiOiAifjQuMS4xIiwKICAg ICAia2FybWEiOiAifjEuNS4wIiwKICAgICAia2FybWEtYmFiZWwtcHJlcHJvY2Vzc29yIjogIl42 LjAuMSIsCmRpZmYgLS1naXQgYS93ZWIveWFybi5sb2NrIGIvd2ViL3lhcm4ubG9jawppbmRleCA1 ZTMxMGQ3OS4uODVjY2JjOGIgMTAwNjQ0Ci0tLSBhL3dlYi95YXJuLmxvY2sKKysrIGIvd2ViL3lh cm4ubG9jawpAQCAtNDI2Nyw5ICs0MjY3LDkgQEAgaXN1cmxAXjEuMC4wLWFscGhhNToKICAgICBo YXMtdG8tc3RyaW5nLXRhZy14ICJeMS4yLjAiCiAgICAgaXMtb2JqZWN0ICJeMS4wLjEiCiAKLWph c21pbmUtY29yZUB+My4xLjA6Ci0gIHZlcnNpb24gIjMuMS4wIgotICByZXNvbHZlZCAiaHR0cHM6 Ly9yZWdpc3RyeS55YXJucGtnLmNvbS9qYXNtaW5lLWNvcmUvLS9qYXNtaW5lLWNvcmUtMy4xLjAu dGd6I2E0Nzg1ZTEzNWQ1ZGY2NTAyNGRmYzkyMjQ5NTNkZjU4NWJkMjc2NmMiCitqYXNtaW5lLWNv cmVAfjIuOTkuMDoKKyAgdmVyc2lvbiAiMi45OS4xIgorICByZXNvbHZlZCAiaHR0cHM6Ly9yZWdp c3RyeS55YXJucGtnLmNvbS9qYXNtaW5lLWNvcmUvLS9qYXNtaW5lLWNvcmUtMi45OS4xLnRneiNl NjQwMGRmMWU2YjU2ZTEzMGI2MWM0YmNkMDkzZGFhN2Y2ZThjYTE1IgogCiBqYXNtaW5lLWVuenlt ZUB+NC4xLjE6CiAgIHZlcnNpb24gIjQuMS4xIgo= --001a114c053cb9427705674b9545--