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 1gizwr-0007LK-Dr for pgadmin-hackers@arkaria.postgresql.org; Mon, 14 Jan 2019 10:58:30 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1gizwo-0001AP-K9 for pgadmin-hackers@arkaria.postgresql.org; Mon, 14 Jan 2019 10:58:26 +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 1gizwo-0001AI-2Q for pgadmin-hackers@lists.postgresql.org; Mon, 14 Jan 2019 10:58:26 +0000 Received: from mail-ot1-x32d.google.com ([2607:f8b0:4864:20::32d]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gizwk-00069N-RW for pgadmin-hackers@postgresql.org; Mon, 14 Jan 2019 10:58:24 +0000 Received: by mail-ot1-x32d.google.com with SMTP id n8so18917355otl.6 for ; Mon, 14 Jan 2019 02:58:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=2P3RE3aYJmAioekRdXgDQvQL6QJn1avdnYjatpl2lR4=; b=tHIgvUS3xEmbFjiq/0UGZF1tV4jlWq3aDRX35WnQDpRoEv0JTgbGBTray1/ncMBm+E 7/tr0ZujZmmrOQjwtjqpuvkd77Erbi1QcMCUZMd4pWEzQ9eVHStRN4NnWkUwAS7MdqXS eHYIwiMrrKUPGoySngY73pR+YPx6F6MeFs5kY8wl3TF1NpYN79WaL1AmD6nyZM2oH6fc MNpE8wc6ORctfdjHjeki5XVpzMhcanvp3dIqeGc65f3WzrdQvk4w1tLEcRFa7oNluIBu DIiow8N0Ug86xKZexIa8y5Ule7D0Z+OU7h3TUocgdLJJbkueeQHkd5eFfgSN4mY6g1Ic pnsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=2P3RE3aYJmAioekRdXgDQvQL6QJn1avdnYjatpl2lR4=; b=B7xuBRPTv7w8ggGxe67MRXsAQxuimDxcu5QTF/mBdtR3Ns2Rp5jmlYwWVVI2MIFW42 CwnbLb30618eisJKVmtUEalI4hd+tH8Gal0dMv4kvX4ZEWWt4Igr1SEEqL2vRkmCiI/F lfFlCTdz667ZXhReXngYnWpX1NFlhqnhdWx7ULjCFbSYBf1EBDe8kMx4MZuWX4w7KywT HTVeexiCxaFvHE1AWTzp6v8lNwJTyxPkM+8rDhBTHiApEVOpAD3drlNNgWkvG+SeoP7r iKppTyx2ev6FJOI2gfI48m8Glb7KcCtxNWIALXG3NCHSN9ZtWbR/viwAI7L3Oo8+/aqT gnRw== X-Gm-Message-State: AJcUukffzPuk+J/Vb57LhAiqQpABjZWaFX3nWQezkEQdixAWylnWjDZ5 n6C3g4Amc9X2OcU+6+agOkU+uti/jQZ6lfx9MzUHNhccYNGJ9w== X-Google-Smtp-Source: ALg8bN5C8AIAsWgcEVDmI93HxjepdT8Drt+cOaCF/YCq5cruG8BFAR7C2MWargBZzteHsJkfTCCYtUZ3El746bhByiQ= X-Received: by 2002:a9d:1d65:: with SMTP id m92mr16953639otm.65.1547463501308; Mon, 14 Jan 2019 02:58:21 -0800 (PST) MIME-Version: 1.0 From: Khushboo Vashi Date: Mon, 14 Jan 2019 16:28:10 +0530 Message-ID: Subject: [pgAdmin4][Patch]: RM - 3051 - ables > Properties > Columns tab is slow on tables with a lot of fields To: pgadmin-hackers Content-Type: multipart/mixed; boundary="0000000000004caa77057f68ece7" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --0000000000004caa77057f68ece7 Content-Type: multipart/alternative; boundary="0000000000004caa72057f68ece5" --0000000000004caa72057f68ece5 Content-Type: text/plain; charset="UTF-8" Hi, Please find the attached patch to fix #3051 - Tables > Properties > Columns tab is slow on tables with a lot of fields The root cause of the issue is bootstrap switch, which has been replaced with bootstrap4-toggle application wide. Thanks, Khushboo --0000000000004caa72057f68ece5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

Please find the attached patch to f= ix #3051 - Tables > Properties > Columns tab is slow on tables with a= lot of fields

The root cause of the issue is boot= strap switch, which has been replaced with bootstrap4-toggle application wi= de.

Thanks,
Khushboo
--0000000000004caa72057f68ece5-- --0000000000004caa77057f68ece7 Content-Type: application/octet-stream; name="RM_3051.patch" Content-Disposition: attachment; filename="RM_3051.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jqw7qua70 ZGlmZiAtLWdpdCBhL2xpYnJhcmllcy50eHQgYi9saWJyYXJpZXMudHh0CmluZGV4IGI3MGViNGFj Li5kYWQ3ZTYxYiAxMDA2NDQKLS0tIGEvbGlicmFyaWVzLnR4dAorKysgYi9saWJyYXJpZXMudHh0 CkBAIC00LDcgKzQsNyBAQCBpbmNsdWRpbmcgUHl0aG9uIG1vZHVsZXMgaW5zdGFsbGVkIHZpYSBQ aXAgd2hpY2ggYXJlIGxpc3RlZCBpbiByZXF1aXJlbWVudHMudHh0LgogTGlicmFyeSAgICAgICAg ICAgICBWZXJzaW9uICAgICAgICBMaWNlbmNlICAgICAgVVJMCiA9PT09PT09ICAgICAgICAgICAg ID09PT09PT0gICAgICAgID09PT09PT0gICAgICA9PT0KIFFUICAgICAgICAgICAgICAgICAgNC42 LjIrICAgICAgICAgTEdQTCB2Mi4xLzMgIGh0dHA6Ly93d3cucXQuaW8vCi1Cb290c3RyYXAgICAg ICAgICAgIDMuMy40ICAgICAgICAgIE1JVCAgICAgICAgICBodHRwOi8vZ2V0Ym9vdHN0cmFwLmNv bS8KK0Jvb3RzdHJhcCAgICAgICAgICAgNC4xLjMgICAgICAgICAgTUlUICAgICAgICAgIGh0dHA6 Ly9nZXRib290c3RyYXAuY29tLwogalF1ZXJ5ICAgICAgICAgICAgICAzLjMuMSAgICAgICAgICBN SVQgICAgICAgICAgaHR0cDovL2pxdWVyeS5jb20vCiBNb2Rlcm5penIgICAgICAgICAgIDIuNi4y ICAgICAgICAgIE1JVC9CU0QgICAgICBodHRwOi8vbW9kZXJuaXpyLmNvbS8KIEFsZXJ0aWZ5SlMg ICAgICAgICAgMS43LjEgICAgICAgICAgTUlUICAgICAgICAgIGh0dHA6Ly9hbGVydGlmeWpzLmNv bS8gKioqIERvIG5vdCB1cGRhdGUgLSBjaGFuZ2VkIHRvIEdQTDMgaW4gMS44LjAgKioqCkBAIC0y MSw3ICsyMSw2IEBAIGZvbnQtQXdlc29tZSAgICAgICAgNC41ICAgICAgICAgICAgU0lMIE9GTCAg ICAgIGh0dHA6Ly9mb3J0YXdlc29tZS5naXRodWIuaW8vRm9uCiBmb250LW1maXp6ICAgICAgICAg IDIuNC4xICAgICAgICAgIE1JVCAgICAgICAgICBodHRwOi8vZml6emVkLmNvbS9vc3MvZm9udC1t Zml6egogYmFja2dyaWQuanMgICAgICAgICAwLjMuNSAgICAgICAgICBNSVQgICAgICAgICAgaHR0 cDovL2JhY2tncmlkanMuY29tLwogYmFja2JvbmUudW5kbyAgICAgICAwLjIgICAgICAgICAgICBN SVQgICAgICAgICAgaHR0cDovL2JhY2tib25lLnVuZG9qcy5jb20vCi1ib290c3RyYXAtc3dpdGNo ICAgIDMuMy4yICAgICAgICAgIE1JVCAgICAgICAgICBodHRwOi8vd3d3LmJvb3RzdHJhcC1zd2l0 Y2gub3JnLwogc2VsZWN0MiAgICAgICAgICAgICA0LjAuMSAgICAgICAgICBNSVQgICAgICAgICAg aHR0cHM6Ly9zZWxlY3QyLmdpdGh1Yi5pby8KIGJhY2tncmlkLWZpbHRlciAgICAgMDFiMmIyMSAg ICAgICAgTUlUICAgICAgICAgIGh0dHBzOi8vZ2l0aHViLmNvbS93eXVlbmhvL2JhY2tncmlkLWZp bHRlcgogYmFja2JvbmUucGFnaW5hdG9yICAyLjAuMyAgICAgICAgICBNSVQgICAgICAgICAgaHR0 cDovL2dpdGh1Yi5jb20vYmFja2JvbmUtcGFnaW5hdG9yL2JhY2tib25lLnBhZ2luYXRvcgpAQCAt NDEsMyArNDAsNCBAQCBNb3VzZXRyYXAgICAgICAgICAgIDEuNi4xICAgICAgICAgIEFMICAgICAg ICAgICBodHRwczovL2dpdGh1Yi5jb20vY2NhbXBiZWxsL21vdQogQXhpb3MgICAgICAgICAgICAg ICAwLjE4LjAgICAgICAgICBNSVQgICAgICAgICAgaHR0cHM6Ly9naXRodWIuY29tL2F4aW9zL2F4 aW9zCiBsZWFmbGV0ICAgICAgICAgICAgIDEuMy4zICAgICAgICAgIEJTRCAgICAgICAgICBodHRw czovL2xlYWZsZXRqcy5jb20vCiB3a3ggICAgICAgICAgICAgICAgIDAuNC41ICAgICAgICAgIE1J VCAgICAgICAgICBodHRwczovL2dpdGh1Yi5jb20vY3NjaHdhcnovd2t4CitCb290c3RyYXA0LXRv Z2dsZSAgIDMuNC4wICAgICAgICAgIE1JVCAgICAgICAgICBodHRwczovL2dpdGJyZW50LmdpdGh1 Yi5pby9ib290c3RyYXA0LXRvZ2dsZQpkaWZmIC0tZ2l0IGEvd2ViL3BhY2thZ2UuanNvbiBiL3dl Yi9wYWNrYWdlLmpzb24KaW5kZXggYTU1NGJiYjUuLjRiNmE1Yzc2IDEwMDY0NAotLS0gYS93ZWIv cGFja2FnZS5qc29uCisrKyBiL3dlYi9wYWNrYWdlLmpzb24KQEAgLTU5LDcgKzU5LDYgQEAKICAg ICAiYmlnbnVtYmVyLmpzIjogIl42LjAuMCIsCiAgICAgImJvb3RzdHJhcCI6ICJeNC4xLjMiLAog ICAgICJib290c3RyYXAtZGF0ZXBpY2tlciI6ICJeMS43LjAiLAotICAgICJib290c3RyYXAtc3dp dGNoIjogIjMuMy40IiwKICAgICAiYm93c2VyIjogIjEuNi4xIiwKICAgICAiYnJvd3NlcmlmeSI6 ICJ+MTQuMS4wIiwKICAgICAiY29kZW1pcnJvciI6ICJeNS4yOS4wIiwKQEAgLTk4LDcgKzk3LDgg QEAKICAgICAidW5kZXJzY29yZS5zdHJpbmciOiAiXjMuMy40IiwKICAgICAid2F0Y2hpZnkiOiAi fjMuOS4wIiwKICAgICAid2ViY2FiaW4tZG9ja2VyIjogImdpdCtodHRwczovL2dpdGh1Yi5jb20v RW50ZXJwcmlzZURCL3djRG9ja2VyLyMyNWY2ZmRhNjI0YzU0NjkzNDBkYTBjMTExYTE4NTQ1YTQ0 NTU5NzNhIiwKLSAgICAid2t4IjogIl4wLjQuNSIKKyAgICAid2t4IjogIl4wLjQuNSIsCisgICAg ImJvb3RzdHJhcDQtdG9nZ2xlIjogIjMuNC4wIgogICB9LAogICAic2NyaXB0cyI6IHsKICAgICAi bGludGVyIjogInlhcm4gZXNsaW50IC0tbm8tZXNsaW50cmMgLWMgLmVzbGludHJjLmpzIC0tZXh0 IC5qcyAtLWV4dCAuanN4IC4iLApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL3NlcnZlcnMvcm9sZXMvc3RhdGljL2pzL3JvbGUuanMgYi93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9yb2xlcy9zdGF0aWMvanMvcm9sZS5qcwppbmRl eCAxN2VlMGM0NC4uZWRiY2ZiZjQgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL3JvbGVzL3N0YXRpYy9qcy9yb2xlLmpzCisrKyBiL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3JvbGVzL3N0YXRpYy9qcy9yb2xlLmpz CkBAIC03Miw3ICs3Miw3IEBAIGRlZmluZSgncGdhZG1pbi5ub2RlLnJvbGUnLCBbCiAKICAgdmFy IHN3aXRjaE9wdGlvbnMgPSB7CiAgICAgJ29uVGV4dCc6IGdldHRleHQoJ1llcycpLCAnb2ZmVGV4 dCc6IGdldHRleHQoJ05vJyksCi0gICAgJ3NpemUnOiAnbWluaScsCisgICAgJ3NpemUnOiAnc21h bGwnLAogICB9OwogCiAgIHZhciBSb2xlQ3VzdG9tU3dpdGNoQ29udHJvbCA9IEJhY2tmb3JtLlN3 aXRjaENvbnRyb2wuZXh0ZW5kKHsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL3N0YXRpYy9qcy9zZXJ2ZXIuanMgYi93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9zdGF0aWMvanMvc2VydmVyLmpzCmluZGV4IDU0MGJl YmVjLi45MjRkYWRjMCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3Jv dXBzL3NlcnZlcnMvc3RhdGljL2pzL3NlcnZlci5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9zdGF0aWMvanMvc2VydmVyLmpzCkBAIC05MzYsNyArOTM2 LDcgQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUuc2VydmVyJywgWwogICAgICAgICAgIGlkOiAndHVu bmVsX2F1dGhlbnRpY2F0aW9uJywgbGFiZWw6IGdldHRleHQoJ0F1dGhlbnRpY2F0aW9uJyksIHR5 cGU6ICdzd2l0Y2gnLAogICAgICAgICAgIG1vZGU6IFsncHJvcGVydGllcycsICdlZGl0JywgJ2Ny ZWF0ZSddLCBncm91cDogZ2V0dGV4dCgnU1NIIFR1bm5lbCcpLAogICAgICAgICAgICdvcHRpb25z JzogeydvblRleHQnOiAgZ2V0dGV4dCgnSWRlbnRpdHkgZmlsZScpLAotICAgICAgICAgICAgJ29m ZlRleHQnOiAgZ2V0dGV4dCgnUGFzc3dvcmQnKSwgJ3NpemUnOiAnc21hbGwnfSwKKyAgICAgICAg ICAgICdvZmZUZXh0JzogIGdldHRleHQoJ1Bhc3N3b3JkJyksICdzaXplJzogJycsIHdpZHRoOiAn MTEwJ30sCiAgICAgICAgICAgZGVwczogWyd1c2Vfc3NoX3R1bm5lbCddLAogICAgICAgICAgIGRp c2FibGVkOiBmdW5jdGlvbihtb2RlbCkgewogICAgICAgICAgICAgcmV0dXJuICFtb2RlbC5nZXQo J3VzZV9zc2hfdHVubmVsJyk7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9taXNjL3N0YXRpc3Rp Y3Mvc3RhdGljL2pzL3N0YXRpc3RpY3MuanMgYi93ZWIvcGdhZG1pbi9taXNjL3N0YXRpc3RpY3Mv c3RhdGljL2pzL3N0YXRpc3RpY3MuanMKaW5kZXggY2ZkNTczZTEuLjk1YTRjZDgwIDEwMDY0NAot LS0gYS93ZWIvcGdhZG1pbi9taXNjL3N0YXRpc3RpY3Mvc3RhdGljL2pzL3N0YXRpc3RpY3MuanMK KysrIGIvd2ViL3BnYWRtaW4vbWlzYy9zdGF0aXN0aWNzL3N0YXRpYy9qcy9zdGF0aXN0aWNzLmpz CkBAIC0xMDQsNyArMTA0LDkgQEAgZGVmaW5lKCdtaXNjLnN0YXRpc3RpY3MnLCBbCiAgICAgICBv ZmZUZXh0OiBnZXR0ZXh0KCdGYWxzZScpLAogICAgICAgb25Db2xvcjogJ3N1Y2Nlc3MnLAogICAg ICAgb2ZmQ29sb3I6ICdwcmltYXJ5JywKLSAgICAgIHNpemU6ICdtaW5pJywKKyAgICAgIHNpemU6 ICdzbWFsbCcsCisgICAgICB3aWR0aDogbnVsbCwKKyAgICAgIGhlaWdodDogbnVsbCwKICAgICB9 CiAgICk7CiAKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3ByZWZlcmVuY2VzL3N0YXRpYy9qcy9w cmVmZXJlbmNlcy5qcyBiL3dlYi9wZ2FkbWluL3ByZWZlcmVuY2VzL3N0YXRpYy9qcy9wcmVmZXJl bmNlcy5qcwppbmRleCAzM2I3ZTc0Ny4uMjMyNGU1YWYgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWlu L3ByZWZlcmVuY2VzL3N0YXRpYy9qcy9wcmVmZXJlbmNlcy5qcworKysgYi93ZWIvcGdhZG1pbi9w cmVmZXJlbmNlcy9zdGF0aWMvanMvcHJlZmVyZW5jZXMuanMKQEAgLTIxNCw4ICsyMTQsOCBAQCBk ZWZpbmUoJ3BnYWRtaW4ucHJlZmVyZW5jZXMnLCBbCiAgICAgICAgICAgICAgICAgb25UZXh0OiBn ZXR0ZXh0KCdUcnVlJyksCiAgICAgICAgICAgICAgICAgb2ZmVGV4dDogZ2V0dGV4dCgnRmFsc2Un KSwKICAgICAgICAgICAgICAgICBvbkNvbG9yOiAnc3VjY2VzcycsCi0gICAgICAgICAgICAgICAg b2ZmQ29sb3I6ICdkZWZhdWx0JywKLSAgICAgICAgICAgICAgICBzaXplOiAnbWluaScsCisgICAg ICAgICAgICAgICAgb2ZmQ29sb3I6ICdwcmltYXJ5JywKKyAgICAgICAgICAgICAgICBzaXplOiAn c21hbGwnLAogICAgICAgICAgICAgICB9OwogICAgICAgICAgICAgICByZXR1cm4gJ3N3aXRjaCc7 CiAgICAgICAgICAgICBjYXNlICdub2RlJzoKQEAgLTIyMyw4ICsyMjMsOCBAQCBkZWZpbmUoJ3Bn YWRtaW4ucHJlZmVyZW5jZXMnLCBbCiAgICAgICAgICAgICAgICAgb25UZXh0OiBnZXR0ZXh0KCdT aG93JyksCiAgICAgICAgICAgICAgICAgb2ZmVGV4dDogZ2V0dGV4dCgnSGlkZScpLAogICAgICAg ICAgICAgICAgIG9uQ29sb3I6ICdzdWNjZXNzJywKLSAgICAgICAgICAgICAgICBvZmZDb2xvcjog J2RlZmF1bHQnLAotICAgICAgICAgICAgICAgIHNpemU6ICdtaW5pJywKKyAgICAgICAgICAgICAg ICBvZmZDb2xvcjogJ3ByaW1hcnknLAorICAgICAgICAgICAgICAgIHNpemU6ICdzbWFsbCcsCiAg ICAgICAgICAgICAgIH07CiAgICAgICAgICAgICAgIHJldHVybiAnc3dpdGNoJzsKICAgICAgICAg ICAgIGNhc2UgJ2ludGVnZXInOgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL2Nzcy9z dHlsZS5jc3MgYi93ZWIvcGdhZG1pbi9zdGF0aWMvY3NzL3N0eWxlLmNzcwppbmRleCBhZWIwMzU0 YS4uZTcyOTNkNDcgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9jc3Mvc3R5bGUuY3Nz CisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9jc3Mvc3R5bGUuY3NzCkBAIC0zLDcgKzMsNyBAQAog QGltcG9ydCAnfmZvbnQtYXdlc29tZS9jc3MvZm9udC1hd2Vzb21lLmNzcyc7CiBAaW1wb3J0ICd+ Ym9vdHN0cmFwLWRhdGVwaWNrZXIvZGlzdC9jc3MvYm9vdHN0cmFwLWRhdGVwaWNrZXIzLmNzcyc7 CiBAaW1wb3J0ICd+dGVtcHVzZG9taW51cy1ib290c3RyYXAtNC9idWlsZC9jc3MvdGVtcHVzZG9t aW51cy1ib290c3RyYXAtNC5jc3MnOwotQGltcG9ydCAnfmJvb3RzdHJhcC1zd2l0Y2gvZGlzdC9j c3MvYm9vdHN0cmFwMy9ib290c3RyYXAtc3dpdGNoLmNzcyc7CitAaW1wb3J0ICd+Ym9vdHN0cmFw NC10b2dnbGUvY3NzL2Jvb3RzdHJhcDQtdG9nZ2xlLmNzcyc7CiBAaW1wb3J0ICd+YmFja2dyaWQt c2VsZWN0LWFsbC9iYWNrZ3JpZC1zZWxlY3QtYWxsLmNzcyc7CiBAaW1wb3J0ICd+YmFja2dyaWQt ZmlsdGVyL2JhY2tncmlkLWZpbHRlci5jc3MnOwogQGltcG9ydCAnfmJhY2tncmlkLXNpemVhYmxl LWNvbHVtbnMvYmFja2dyaWQtc2l6ZWFibGUtY29sdW1ucy5jc3MnOwpkaWZmIC0tZ2l0IGEvd2Vi L3BnYWRtaW4vc3RhdGljL2pzL2JhY2tmb3JtLnBnYWRtaW4uanMgYi93ZWIvcGdhZG1pbi9zdGF0 aWMvanMvYmFja2Zvcm0ucGdhZG1pbi5qcwppbmRleCAyNDZiMzBiNy4uZWEzYzQ2NjQgMTAwNjQ0 Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9iYWNrZm9ybS5wZ2FkbWluLmpzCisrKyBiL3dl Yi9wZ2FkbWluL3N0YXRpYy9qcy9iYWNrZm9ybS5wZ2FkbWluLmpzCkBAIC0xMCw3ICsxMCw3IEBA CiBkZWZpbmUoWwogICAnc291cmNlcy9nZXR0ZXh0JywgJ3VuZGVyc2NvcmUnLCAndW5kZXJzY29y ZS5zdHJpbmcnLCAnanF1ZXJ5JywKICAgJ2JhY2tib25lJywgJ2JhY2tmb3JtJywgJ2JhY2tncmlk JywgJ2NvZGVtaXJyb3InLCAnc291cmNlcy9zcWxlZGl0b3JfdXRpbHMnLAotICAnc3BlY3RydW0n LCAncGdhZG1pbi5iYWNrZ3JpZCcsICdzZWxlY3QyJywKKyAgJ3NwZWN0cnVtJywgJ3BnYWRtaW4u YmFja2dyaWQnLCAnc2VsZWN0MicsICdib290c3RyYXAudG9nZ2xlJywKIF0sIGZ1bmN0aW9uKGdl dHRleHQsIF8sIFMsICQsIEJhY2tib25lLCBCYWNrZm9ybSwgQmFja2dyaWQsIENvZGVNaXJyb3Is IFNxbEVkaXRvclV0aWxzKSB7CiAKICAgdmFyIHBnQWRtaW4gPSAod2luZG93LnBnQWRtaW4gPSB3 aW5kb3cucGdBZG1pbiB8fCB7fSksCkBAIC00MzAsNiArNDMwLDggQEAgZGVmaW5lKFsKICAgICAg ICAgb25Db2xvcjogJ3N1Y2Nlc3MnLAogICAgICAgICBvZmZDb2xvcjogJ3ByaW1hcnknLAogICAg ICAgICBzaXplOiAnc21hbGwnLAorICAgICAgICB3aWR0aDogbnVsbCwKKyAgICAgICAgaGVpZ2h0 OiBudWxsLAogICAgICAgfSwKICAgICAgIGNvbnRyb2xMYWJlbENsYXNzTmFtZTogQmFja2Zvcm0u Y29udHJvbExhYmVsQ2xhc3NOYW1lLAogICAgICAgY29udHJvbHNDbGFzc05hbWU6IEJhY2tmb3Jt LmNvbnRyb2xzQ2xhc3NOYW1lLApAQCAtNDQwLDkgKzQ0MiwxMSBAQCBkZWZpbmUoWwogICAgICAg JzxsYWJlbCBjbGFzcz0iPCU9Y29udHJvbExhYmVsQ2xhc3NOYW1lJT4iPjwlPWxhYmVsJT48L2xh YmVsPicsCiAgICAgICAnPGRpdiBjbGFzcz0iPCU9Y29udHJvbHNDbGFzc05hbWUlPiI+JywKICAg ICAgICcgIDxkaXYgY2xhc3M9ImNoZWNrYm94Ij4nLAotICAgICAgJyAgICA8bGFiZWw+JywKLSAg ICAgICcgICAgICA8aW5wdXQgdHlwZT0iY2hlY2tib3giIGNsYXNzPSI8JT1leHRyYUNsYXNzZXMu am9pbihcJyBcJyklPiIgbmFtZT0iPCU9bmFtZSU+IiA8JT12YWx1ZSA/ICJjaGVja2VkPVwnY2hl Y2tlZFwnIiA6ICIiJT4gPCU9ZGlzYWJsZWQgPyAiZGlzYWJsZWQiIDogIiIlPiA8JT1yZXF1aXJl ZCA/ICJyZXF1aXJlZCIgOiAiIiU+IC8+JywKLSAgICAgICcgICAgPC9sYWJlbD4nLAorICAgICAg JyAgICAgIDxpbnB1dCB0eXBlPSJjaGVja2JveCIgaWQ9ImJvb3RzdHJhcFRvZ2dsZSIgZGF0YS1z dHlsZT0icXVpY2siIGRhdGEtdG9nZ2xlPSJ0b2dnbGUiJywKKyAgICAgICcgICAgICBkYXRhLXNp emU9IjwlPW9wdGlvbnMuc2l6ZSU+IiBkYXRhLWhlaWdodD0iPCU9b3B0aW9ucy5oZWlnaHQlPiIg ICcsCisgICAgICAnICAgICAgZGF0YS1vbj0iPCU9b3B0aW9ucy5vblRleHQlPiIgZGF0YS1vZmY9 IjwlPW9wdGlvbnMub2ZmVGV4dCU+IiAnLAorICAgICAgJyAgICAgIGRhdGEtb25zdHlsZT0iPCU9 b3B0aW9ucy5vbkNvbG9yJT4iIGRhdGEtb2Zmc3R5bGU9IjwlPW9wdGlvbnMub2ZmQ29sb3IlPiIg ZGF0YS13aWR0aD0iPCU9b3B0aW9ucy53aWR0aCU+IiAnLAorICAgICAgJyAgICAgIG5hbWU9Ijwl PW5hbWUlPiIgPCU9dmFsdWUgPyAiY2hlY2tlZD1cJ2NoZWNrZWRcJyIgOiAiIiU+IDwlPWRpc2Fi bGVkID8gImRpc2FibGVkIiA6ICIiJT4gPCU9cmVxdWlyZWQgPyAicmVxdWlyZWQiIDogIiIlPiAv PicsCiAgICAgICAnICA8L2Rpdj4nLAogICAgICAgJyAgPCUgaWYgKGhlbHBNZXNzYWdlICYmIGhl bHBNZXNzYWdlLmxlbmd0aCkgeyAlPicsCiAgICAgICAnICAgIDxzcGFuIGNsYXNzPSI8JT1CYWNr Zm9ybS5oZWxwTWVzc2FnZUNsYXNzTmFtZSU+Ij48JT1oZWxwTWVzc2FnZSU+PC9zcGFuPicsCkBA IC00NTYsNyArNDYwLDcgQEAgZGVmaW5lKFsKICAgICAgICk7CiAgICAgfSwKICAgICBldmVudHM6 IHsKLSAgICAgICdzd2l0Y2hDaGFuZ2UuYm9vdHN0cmFwU3dpdGNoJzogJ29uQ2hhbmdlJywKKyAg ICAgICdjaGFuZ2UgaW5wdXQjYm9vdHN0cmFwVG9nZ2xlJzogJ29uQ2hhbmdlJywKICAgICB9LAog ICAgIHJlbmRlcjogZnVuY3Rpb24oKSB7CiAgICAgICB2YXIgZmllbGQgPSBfLmRlZmF1bHRzKHRo aXMuZmllbGQudG9KU09OKCksIHRoaXMuZGVmYXVsdHMpLApAQCAtNDY1LDIzICs0NjksNDkgQEAg ZGVmaW5lKFsKICAgICAgICAgbmFtZSA9IGF0dHJBcnIuc2hpZnQoKSwKICAgICAgICAgcGF0aCA9 IGF0dHJBcnIuam9pbignLicpLAogICAgICAgICByYXdWYWx1ZSA9IHRoaXMua2V5UGF0aEFjY2Vz c29yKGF0dHJpYnV0ZXNbbmFtZV0sIHBhdGgpLAotICAgICAgICBldmFsRiA9IGZ1bmN0aW9uKGYs IGQsIG0pIHsKLSAgICAgICAgICByZXR1cm4gKF8uaXNGdW5jdGlvbihmKSA/ICEhZi5hcHBseShk LCBbbV0pIDogISFmKTsKKyAgICAgICAgZGF0YSA9IF8uZXh0ZW5kKGZpZWxkLCB7CisgICAgICAg ICAgcmF3VmFsdWU6IHJhd1ZhbHVlLAorICAgICAgICAgIHZhbHVlOiB0aGlzLmZvcm1hdHRlci5m cm9tUmF3KHJhd1ZhbHVlLCB0aGlzLm1vZGVsKSwKKyAgICAgICAgICBhdHRyaWJ1dGVzOiBhdHRy aWJ1dGVzLAorICAgICAgICAgIGZvcm1hdHRlcjogdGhpcy5mb3JtYXR0ZXIsCisgICAgICAgIH0p LAorICAgICAgICBldmFsRiA9IGZ1bmN0aW9uKGYsIG0pIHsKKyAgICAgICAgICByZXR1cm4gKF8u aXNGdW5jdGlvbihmKSA/ICEhZihtKSA6ICEhZik7CiAgICAgICAgIH0sCi0gICAgICAgIG9wdGlv bnMgPSBfLmRlZmF1bHRzKHsKLSAgICAgICAgICBkaXNhYmxlZDogZXZhbEYoZmllbGQuZGlzYWJs ZWQsIGZpZWxkLCB0aGlzLm1vZGVsKSwKLSAgICAgICAgfSwgdGhpcy5maWVsZC5nZXQoJ29wdGlv bnMnKSwgdGhpcy5kZWZhdWx0cy5vcHRpb25zLAotICAgICAgICAgICQuZm4uYm9vdHN0cmFwU3dp dGNoLmRlZmF1bHRzKTsKKyAgICAgICAgZXZhbEZMb2NhbCA9IGZ1bmN0aW9uKGYsIGQsIG0pIHsK KyAgICAgICAgICByZXR1cm4gKF8uaXNGdW5jdGlvbihmKSA/ICEhZi5hcHBseShkLCBbbV0pIDog ISFmKTsKKyAgICAgICAgfTsKIAotICAgICAgQmFja2Zvcm0uSW5wdXRDb250cm9sLnByb3RvdHlw ZS5yZW5kZXIuYXBwbHkodGhpcywgYXJndW1lbnRzKTsKLSAgICAgIHRoaXMuJGlucHV0ID0gdGhp cy4kZWwuZmluZCgnaW5wdXRbdHlwZT1jaGVja2JveF0nKS5maXJzdCgpOworICAgICAgLy8gRXZh bHVhdGUgdGhlIGRpc2FibGVkLCB2aXNpYmxlLCBhbmQgcmVxdWlyZWQgb3B0aW9uCisgICAgICBf LmV4dGVuZChkYXRhLCB7CisgICAgICAgIGRpc2FibGVkOiBldmFsRkxvY2FsKGZpZWxkLmRpc2Fi bGVkLCBmaWVsZCwgdGhpcy5tb2RlbCksCisgICAgICAgIHZpc2libGU6ICBldmFsRihkYXRhLnZp c2libGUsIHRoaXMubW9kZWwpLAorICAgICAgICByZXF1aXJlZDogZXZhbEYoZGF0YS5yZXF1aXJl ZCwgdGhpcy5tb2RlbCksCisgICAgICB9KTsKIAotICAgICAgLy9DaGVjayAmIHNldCBhZGRpdGlv bmFsIHByb3BlcnRpZXMKLSAgICAgIHRoaXMuJGlucHV0LmJvb3RzdHJhcFN3aXRjaCgKLSAgICAg ICAgXy5leHRlbmQob3B0aW9ucywgewotICAgICAgICAgICdzdGF0ZSc6IHJhd1ZhbHVlLAotICAg ICAgICB9KQotICAgICAgKTsKKyAgICAgIC8vIENsZWFuIHVwIGZpcnN0CisgICAgICB0aGlzLiRl bC5yZW1vdmVDbGFzcyhCYWNrZm9ybS5oaWRkZW5DbGFzc05hbWUpOworCisgICAgICBpZiAoIWRh dGEudmlzaWJsZSkKKyAgICAgICAgdGhpcy4kZWwuYWRkQ2xhc3MoQmFja2Zvcm0uaGlkZGVuQ2xh c3NOYW1lKTsKKworICAgICAgaWYoQmFja2Zvcm0ucmVxdWlyZWRJbnB1dENsYXNzTmFtZSkgewor ICAgICAgICB0aGlzLiRlbC5yZW1vdmVDbGFzcyhCYWNrZm9ybS5yZXF1aXJlZElucHV0Q2xhc3NO YW1lKTsKKyAgICAgIH0KKworICAgICAgaWYgKGRhdGEucmVxdWlyZWQpIHsKKyAgICAgICAgdGhp cy4kZWwuYWRkQ2xhc3MoQmFja2Zvcm0ucmVxdWlyZWRJbnB1dENsYXNzTmFtZSk7CisgICAgICB9 CisKKyAgICAgIGRhdGEub3B0aW9ucyA9IF8uZGVmYXVsdHMoeworICAgICAgICBkaXNhYmxlZDog ZXZhbEZMb2NhbChmaWVsZC5kaXNhYmxlZCwgZmllbGQsIHRoaXMubW9kZWwpLAorICAgICAgfSwg dGhpcy5maWVsZC5nZXQoJ29wdGlvbnMnKSwgdGhpcy5kZWZhdWx0cy5vcHRpb25zLAorICAgICAg ICAkLmZuLmJvb3RzdHJhcFRvZ2dsZS5kZWZhdWx0cyk7CisKKyAgICAgIHRoaXMuJGVsLmh0bWwo dGhpcy50ZW1wbGF0ZShkYXRhKSkuYWRkQ2xhc3MoZmllbGQubmFtZSk7CisgICAgICB0aGlzLiRp bnB1dCA9IHRoaXMuJGVsLmZpbmQoJ2lucHV0W3R5cGU9Y2hlY2tib3hdJykuZmlyc3QoKTsKKyAg ICAgIHRoaXMuJGlucHV0LmJvb3RzdHJhcFRvZ2dsZSgpOworICAgICAgdGhpcy51cGRhdGVJbnZh bGlkKCk7CiAKICAgICAgIHJldHVybiB0aGlzOwogICAgIH0sCmRpZmYgLS1naXQgYS93ZWIvcGdh ZG1pbi9zdGF0aWMvanMvYmFja2dyaWQucGdhZG1pbi5qcyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9q cy9iYWNrZ3JpZC5wZ2FkbWluLmpzCmluZGV4IDI4MzJiNWFjLi5jZGI4YjBmOSAxMDA2NDQKLS0t IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2JhY2tncmlkLnBnYWRtaW4uanMKKysrIGIvd2ViL3Bn YWRtaW4vc3RhdGljL2pzL2JhY2tncmlkLnBnYWRtaW4uanMKQEAgLTksNyArOSw4IEBACiAKIGRl ZmluZShbCiAgICdzb3VyY2VzL2dldHRleHQnLCAndW5kZXJzY29yZScsICdqcXVlcnknLCAnYmFj a2JvbmUnLCAnYmFja2Zvcm0nLCAnYmFja2dyaWQnLCAnYWxlcnRpZnknLAotICAnbW9tZW50Jywg J2JpZ251bWJlcicsICdib290c3RyYXAuZGF0ZXRpbWVwaWNrZXInLCAnYm9vdHN0cmFwLnN3aXRj aCcsICdiYWNrZ3JpZC5maWx0ZXInLAorICAnbW9tZW50JywgJ2JpZ251bWJlcicsICdib290c3Ry YXAuZGF0ZXRpbWVwaWNrZXInLCAnYmFja2dyaWQuZmlsdGVyJywKKyAgJ2Jvb3RzdHJhcC50b2dn bGUnLAogXSwgZnVuY3Rpb24oCiAgIGdldHRleHQsIF8sICQsIEJhY2tib25lLCBCYWNrZm9ybSwg QmFja2dyaWQsIEFsZXJ0aWZ5LCBtb21lbnQsIEJpZ051bWJlcgogKSB7CkBAIC00NTEsMTggKzQ1 MiwyMCBAQCBkZWZpbmUoWwogICAvKioKICAgICBTd2l0Y2hDZWxsIHJlbmRlcnMgYSBCb290c3Ry YXAgU3dpdGNoIGluIGJhY2tncmlkIGNlbGwKICAgKi8KLSAgaWYgKHdpbmRvdy5qUXVlcnkgJiYg d2luZG93LmpRdWVyeS5mbi5ib290c3RyYXBTd2l0Y2gpCi0gICAgJC5mbi5ib290c3RyYXBTd2l0 Y2ggPSB3aW5kb3cualF1ZXJ5LmZuLmJvb3RzdHJhcFN3aXRjaDsKKyAgaWYgKHdpbmRvdy5qUXVl cnkgJiYgd2luZG93LmpRdWVyeS5mbi5ib290c3RyYXBUb2dnbGUpCisgICAgJC5mbi5ib290c3Ry YXBUb2dnbGUgPSB3aW5kb3cualF1ZXJ5LmZuLmJvb3RzdHJhcFRvZ2dsZTsKIAogICBCYWNrZ3Jp ZC5FeHRlbnNpb24uU3dpdGNoQ2VsbCA9IEJhY2tncmlkLkJvb2xlYW5DZWxsLmV4dGVuZCh7CiAg ICAgZGVmYXVsdHM6IHsKICAgICAgIG9wdGlvbnM6IF8uZGVmYXVsdHMoewotICAgICAgICBvblRl eHQ6IGdldHRleHQoJ1RydWUnKSwKLSAgICAgICAgb2ZmVGV4dDogZ2V0dGV4dCgnRmFsc2UnKSwK KyAgICAgICAgb25UZXh0OiBnZXR0ZXh0KCdZZXMnKSwKKyAgICAgICAgb2ZmVGV4dDogZ2V0dGV4 dCgnTm8nKSwKICAgICAgICAgb25Db2xvcjogJ3N1Y2Nlc3MnLAotICAgICAgICBvZmZDb2xvcjog J2RlZmF1bHQnLAotICAgICAgICBzaXplOiAnbWluaScsCi0gICAgICB9LCAkLmZuLmJvb3RzdHJh cFN3aXRjaC5kZWZhdWx0cyksCisgICAgICAgIG9mZkNvbG9yOiAncHJpbWFyeScsCisgICAgICAg IHNpemU6ICdzbWFsbCcsCisgICAgICAgIHdpZHRoOiBudWxsLAorICAgICAgICBoZWlnaHQ6IG51 bGwsCisgICAgICB9LCAkLmZuLmJvb3RzdHJhcFRvZ2dsZS5kZWZhdWx0cyksCiAgICAgfSwKIAog ICAgIGNsYXNzTmFtZTogJ3N3aXRjaC1jZWxsJywKQEAgLTQ4Miw3ICs0ODUsNyBAQCBkZWZpbmUo WwogICAgIH0sCiAKICAgICBldmVudHM6IHsKLSAgICAgICdzd2l0Y2hDaGFuZ2UuYm9vdHN0cmFw U3dpdGNoJzogJ29uQ2hhbmdlJywKKyAgICAgICdjaGFuZ2UgaW5wdXQjYm9vdHN0cmFwVG9nZ2xl JzogJ29uQ2hhbmdlJywKICAgICB9LAogCiAgICAgb25DaGFuZ2U6IGZ1bmN0aW9uKCkgewpAQCAt NTAzLDcgKzUwNiw4IEBAIGRlZmluZShbCiAgICAgICAgIHJhd1ZhbHVlID0gdGhpcy5mb3JtYXR0 ZXIuZnJvbVJhdygKICAgICAgICAgICBtb2RlbC5nZXQoY29sdW1uLmdldCgnbmFtZScpKSwgbW9k ZWwKICAgICAgICAgKSwKLSAgICAgICAgZWRpdGFibGUgPSBCYWNrZ3JpZC5jYWxsQnlOZWVkKGNv bC5lZGl0YWJsZSwgY29sdW1uLCBtb2RlbCk7CisgICAgICAgIGVkaXRhYmxlID0gQmFja2dyaWQu Y2FsbEJ5TmVlZChjb2wuZWRpdGFibGUsIGNvbHVtbiwgbW9kZWwpLAorICAgICAgICBvcHRpb25z ID0gIF8uZGVmYXVsdHMoe30sIGNvbC5vcHRpb25zLCB0aGlzLmRlZmF1bHRzLm9wdGlvbnMpOwog CiAgICAgICB0aGlzLnVuZGVsZWdhdGVFdmVudHMoKTsKIApAQCAtNTEzLDE3ICs1MTcsMTUgQEAg ZGVmaW5lKFsKICAgICAgICAgJCgnPGlucHV0PicsIHsKICAgICAgICAgICB0YWJJbmRleDogLTEs CiAgICAgICAgICAgdHlwZTogJ2NoZWNrYm94JywKLSAgICAgICAgfSkucHJvcCgnY2hlY2tlZCcs IHJhd1ZhbHVlKS5wcm9wKCdkaXNhYmxlZCcsICFlZGl0YWJsZSkpOworICAgICAgICAgIGlkOiAn Ym9vdHN0cmFwVG9nZ2xlJywKKyAgICAgICAgfSkucHJvcCgnY2hlY2tlZCcsIHJhd1ZhbHVlKS5w cm9wKCdkaXNhYmxlZCcsICFlZGl0YWJsZSkuYXR0cignZGF0YS10b2dnbGUnLCAndG9nZ2xlJykK KyAgICAgICAgLmF0dHIoJ2RhdGEtc2l6ZScsIG9wdGlvbnMuc2l6ZSkuYXR0cignZGF0YS1vbics IG9wdGlvbnMub25UZXh0KS5hdHRyKCdkYXRhLW9mZicsIG9wdGlvbnMub2ZmVGV4dCkKKyAgICAg ICAgLmF0dHIoJ2RhdGEtb25zdHlsZScsIG9wdGlvbnMub25Db2xvcikuYXR0cignZGF0YS1vZmZz dHlsZScsIG9wdGlvbnMub2ZmQ29sb3IpKTsKKwogICAgICAgdGhpcy4kaW5wdXQgPSB0aGlzLiRl bC5maW5kKCdpbnB1dFt0eXBlPWNoZWNrYm94XScpLmZpcnN0KCk7CiAKICAgICAgIC8vIE92ZXJy aWRlIEJvb2xlYW5DZWxsIGNoZWNrYm94IHdpdGggQm9vdHN0cmFwc3dpdGNoCi0gICAgICB0aGlz LiRpbnB1dC5ib290c3RyYXBTd2l0Y2goCi0gICAgICAgIF8uZGVmYXVsdHMoewotICAgICAgICAg ICdzdGF0ZSc6IHJhd1ZhbHVlLAotICAgICAgICAgICdkaXNhYmxlZCc6ICFlZGl0YWJsZSwKLSAg ICAgICAgfSwgY29sLm9wdGlvbnMsCi0gICAgICAgICAgdGhpcy5kZWZhdWx0cy5vcHRpb25zCi0g ICAgICAgICkpOworICAgICAgdGhpcy4kaW5wdXQuYm9vdHN0cmFwVG9nZ2xlKCk7CiAKICAgICAg IC8vIExpc3RlbiBmb3IgVGFiIGtleQogICAgICAgdGhpcy4kZWwub24oJ2tleWRvd24nLCBmdW5j dGlvbihlKSB7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9fYm9vdHN0cmFw Lm92ZXJyaWRlcy5zY3NzIGIvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX2Jvb3RzdHJhcC5vdmVy cmlkZXMuc2NzcwppbmRleCBmZWJlN2FkNy4uMjI0YzU5N2YgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2Fk bWluL3N0YXRpYy9zY3NzL19ib290c3RyYXAub3ZlcnJpZGVzLnNjc3MKKysrIGIvd2ViL3BnYWRt aW4vc3RhdGljL3Njc3MvX2Jvb3RzdHJhcC5vdmVycmlkZXMuc2NzcwpAQCAtMjI4LDMwICsyMjgs MTMgQEAgbGVnZW5kIHsKIAlmb250LXNpemU6IDEzcHg7CiB9CiAKLQotLyogUmVtb3ZlIGRlZmF1 bHQgbGVmdCBwYWRkaW5nIGZyb20gY2hlY2tib3ggZm9yIGJvb3RzdHJhcC1zd2l0Y2ggKi8KLS5j aGVja2JveCB7Ci0JbWFyZ2luLWJvdHRvbTogMHB4ICFpbXBvcnRhbnQ7Ci0JbWFyZ2luLXRvcDog MHB4ICFpbXBvcnRhbnQ7Ci19Ci0uY2hlY2tib3ggbGFiZWwgewotCXBhZGRpbmctbGVmdDogMHB4 ICFpbXBvcnRhbnQ7Ci0JbWFyZ2luLWJvdHRvbTogMHB4ICFpbXBvcnRhbnQ7Ci19Ci0uYm9vdHN0 cmFwLXN3aXRjaCA+IC5ib290c3RyYXAtc3dpdGNoLWNvbnRhaW5lciA+IGlucHV0IHsKLQlib3Jk ZXI6IDBweCBzb2xpZCAkY29sb3ItZmc7Ci0JaGVpZ2h0OiAwcHg7Ci0JbWFyZ2luOiAwcHg7Ci0J cGFkZGluZzogMHB4OwotCXdpZHRoOiAwcHg7Ci19CiAuc3dpdGNoLWNlbGwgewogCWhlaWdodDog MHB4OwogCXdpZHRoOiAwcHg7CiB9CiAKIC8qIENlbnRlciBhbGlnbiB0aGUgc3dpdGNoIGluIGJh Y2tncmlkICovCi10ZC5zd2l0Y2gtY2VsbCA+IGRpdi5ib290c3RyYXAtc3dpdGNoIHsKK3RkLnN3 aXRjaC1jZWxsID4gZGl2LnRvZ2dsZSB7CiAJZGlzcGxheTogYmxvY2s7CiAJbWFyZ2luOiBhdXRv OwogfQpAQCAtMzA4LDEzICsyOTEsNiBAQCB0ZC5zd2l0Y2gtY2VsbCA+IGRpdi5ib290c3RyYXAt c3dpdGNoIHsKICAgbGluZS1oZWlnaHQ6IDAuN3JlbTsKIH0KIAotCi0uYm9vdHN0cmFwLXN3aXRj aC5ib290c3RyYXAtc3dpdGNoLWRpc2FibGVkLCAuYm9vdHN0cmFwLXN3aXRjaC5ib290c3RyYXAt c3dpdGNoLXJlYWRvbmx5IHsKLSAgYmFja2dyb3VuZC1jb2xvcjogJGlucHV0LWRpc2FibGVkLWJn ICFpbXBvcnRhbnQ7Ci0gIG9wYWNpdHk6IDE7Ci19Ci0KLQogLmJ0bi10b29sYmFyIHsKICAgbWlu LXdpZHRoOiAxMDAlOwogfQpAQCAtMzI5LDEwICszMDUsNiBAQCB0ZC5zd2l0Y2gtY2VsbCA+IGRp di5ib290c3RyYXAtc3dpdGNoIHsKIAl9CiB9CiAKLS8qIGJvb3RzdHJhcC1zd2l0Y2ggKi8KLS5i b290c3RyYXAtc3dpdGNoIC5ib290c3RyYXAtc3dpdGNoLWhhbmRsZS1vbi5ib290c3RyYXAtc3dp dGNoLXByaW1hcnksIC5ib290c3RyYXAtc3dpdGNoIC5ib290c3RyYXAtc3dpdGNoLWhhbmRsZS1v ZmYuYm9vdHN0cmFwLXN3aXRjaC1wcmltYXJ5IHsKLQliYWNrZ3JvdW5kOiAkY29sb3ItcHJpbWFy eTsKLX0KLS5ib290c3RyYXAtc3dpdGNoIC5ib290c3RyYXAtc3dpdGNoLWhhbmRsZS1vbi5ib290 c3RyYXAtc3dpdGNoLXN1Y2Nlc3MsIC5ib290c3RyYXAtc3dpdGNoIC5ib290c3RyYXAtc3dpdGNo LWhhbmRsZS1vZmYuYm9vdHN0cmFwLXN3aXRjaC1zdWNjZXNzIHsKLQliYWNrZ3JvdW5kOiAkY29s b3Itc3VjY2VzczsKKy5idG4uZGlzYWJsZWQsIC5idG46ZGlzYWJsZWQsIC5idG5bZGlzYWJsZWRd IHsKKyAgb3BhY2l0eTogJGJ0bi1kaXNhYmxlZC1vcGFjaXR5OwogfQpkaWZmIC0tZ2l0IGEvd2Vi L3BnYWRtaW4vdG9vbHMvYmFja3VwL3N0YXRpYy9qcy9iYWNrdXAuanMgYi93ZWIvcGdhZG1pbi90 b29scy9iYWNrdXAvc3RhdGljL2pzL2JhY2t1cC5qcwppbmRleCA3MGU4YTY4Yi4uNTM1YTc2NWMg MTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL2JhY2t1cC9zdGF0aWMvanMvYmFja3VwLmpz CisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2JhY2t1cC9zdGF0aWMvanMvYmFja3VwLmpzCkBAIC00 NCwyMSArNDQsNiBAQCBkZWZpbmUoWwogICAqLwogCiAgIEJhY2tmb3JtLkN1c3RvbVN3aXRjaENv bnRyb2wgPSBCYWNrZm9ybS5Td2l0Y2hDb250cm9sLmV4dGVuZCh7Ci0gICAgdGVtcGxhdGU6IF8u dGVtcGxhdGUoWwotICAgICAgJzxsYWJlbCBjbGFzcz0iPCU9Y29udHJvbExhYmVsQ2xhc3NOYW1l JT4gY3VzdG9tX3N3aXRjaF9sYWJlbF9jbGFzcyI+PCU9bGFiZWwlPjwvbGFiZWw+JywKLSAgICAg ICc8ZGl2IGNsYXNzPSI8JT1jb250cm9sc0NsYXNzTmFtZSU+IGN1c3RvbV9zd2l0Y2hfY29udHJv bF9jbGFzcyI+JywKLSAgICAgICcgIDxkaXYgY2xhc3M9ImNoZWNrYm94Ij4nLAotICAgICAgJyAg ICA8bGFiZWw+JywKLSAgICAgICcgICAgICA8aW5wdXQgdHlwZT0iY2hlY2tib3giIGNsYXNzPSI8 JT1leHRyYUNsYXNzZXMuam9pbihcJyBcJyklPiInLAotICAgICAgJyAgICAgICAgbmFtZT0iPCU9 bmFtZSU+IiA8JT12YWx1ZSA/ICJjaGVja2VkPVwnY2hlY2tlZFwnIiA6ICIiJT4nLAotICAgICAg JyAgICAgICAgPCU9ZGlzYWJsZWQgPyAiZGlzYWJsZWQiIDogIiIlPiA8JT1yZXF1aXJlZCA/ICJy ZXF1aXJlZCIgOiAiIiU+IC8+JywKLSAgICAgICcgICAgPC9sYWJlbD4nLAotICAgICAgJyAgPC9k aXY+JywKLSAgICAgICc8L2Rpdj4nLAotICAgICAgJzwlIGlmIChoZWxwTWVzc2FnZSAmJiBoZWxw TWVzc2FnZS5sZW5ndGgpIHsgJT4nLAotICAgICAgJyAgPHNwYW4gY2xhc3M9IjwlPUJhY2tmb3Jt LmhlbHBNZXNzYWdlQ2xhc3NOYW1lJT4iPjwlPWhlbHBNZXNzYWdlJT48L3NwYW4+JywKLSAgICAg ICc8JSB9ICU+JywKLSAgICBdLmpvaW4oJ1xuJykpLAogICAgIGNsYXNzTmFtZTogJ3BnYWRtaW4t Y29udHJvbC1ncm91cCBmb3JtLWdyb3VwIHBnLWVsLW1kLTYgcGctZWwtMTIgcm93JywKICAgfSk7 CiAKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL21haW50ZW5hbmNlL3N0YXRpYy9qcy9t YWludGVuYW5jZS5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL21haW50ZW5hbmNlL3N0YXRpYy9qcy9t YWludGVuYW5jZS5qcwppbmRleCBmOGQ4ODkwOC4uNTkxYmY4ODAgMTAwNjQ0Ci0tLSBhL3dlYi9w Z2FkbWluL3Rvb2xzL21haW50ZW5hbmNlL3N0YXRpYy9qcy9tYWludGVuYW5jZS5qcworKysgYi93 ZWIvcGdhZG1pbi90b29scy9tYWludGVuYW5jZS9zdGF0aWMvanMvbWFpbnRlbmFuY2UuanMKQEAg LTMwLDE5ICszMCw2IEBAIGRlZmluZShbCiAgICAgcmV0dXJuIHBnQWRtaW4uVG9vbHMubWFpbnRl bmFuY2U7CiAKICAgQmFja2Zvcm0uQ3VzdG9tU3dpdGNoQ29udHJvbCA9IEJhY2tmb3JtLlN3aXRj aENvbnRyb2wuZXh0ZW5kKHsKLSAgICB0ZW1wbGF0ZTogXy50ZW1wbGF0ZShbCi0gICAgICAnPGxh YmVsIGNsYXNzPSI8JT1CYWNrZm9ybS5jb250cm9sTGFiZWxDbGFzc05hbWUlPiBjdXN0b21fc3dp dGNoX2xhYmVsX2NsYXNzIj48JT1sYWJlbCU+PC9sYWJlbD4nLAotICAgICAgJzxkaXYgY2xhc3M9 IjwlPUJhY2tmb3JtLmNvbnRyb2xzQ2xhc3NOYW1lJT4gY3VzdG9tX3N3aXRjaF9jb250cm9sX2Ns YXNzIj4nLAotICAgICAgJyAgPGRpdiBjbGFzcz0iY2hlY2tib3giPicsCi0gICAgICAnICAgIDxs YWJlbD4nLAotICAgICAgJyAgICAgIDxpbnB1dCB0eXBlPSJjaGVja2JveCIgY2xhc3M9IjwlPWV4 dHJhQ2xhc3Nlcy5qb2luKFwnIFwnKSU+IiBuYW1lPSI8JT1uYW1lJT4iIDwlPXZhbHVlID8gImNo ZWNrZWQ9XCdjaGVja2VkXCciIDogIiIlPiA8JT1kaXNhYmxlZCA/ICJkaXNhYmxlZCIgOiAiIiU+ IDwlPXJlcXVpcmVkID8gInJlcXVpcmVkIiA6ICIiJT4gLz4nLAotICAgICAgJyAgICA8L2xhYmVs PicsCi0gICAgICAnICA8L2Rpdj4nLAotICAgICAgJzwvZGl2PicsCi0gICAgICAnPCUgaWYgKGhl bHBNZXNzYWdlICYmIGhlbHBNZXNzYWdlLmxlbmd0aCkgeyAlPicsCi0gICAgICAnICA8c3BhbiBj bGFzcz0iPCU9QmFja2Zvcm0uaGVscE1lc3NhZ2VDbGFzc05hbWUlPiI+PCU9aGVscE1lc3NhZ2Ul Pjwvc3Bhbj4nLAotICAgICAgJzwlIH0gJT4nLAotICAgIF0uam9pbignXG4nKSksCiAgICAgY2xh c3NOYW1lOiAncGdhZG1pbi1jb250cm9sLWdyb3VwIGZvcm0tZ3JvdXAgcGctZWwtbWQtNiBwZy1l bC0xMiByb3cnLAogICB9KTsKIApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvcmVzdG9y ZS9zdGF0aWMvanMvcmVzdG9yZS5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3Jlc3RvcmUvc3RhdGlj L2pzL3Jlc3RvcmUuanMKaW5kZXggMWYyNDlhYmYuLjZjNzk0NzZkIDEwMDY0NAotLS0gYS93ZWIv cGdhZG1pbi90b29scy9yZXN0b3JlL3N0YXRpYy9qcy9yZXN0b3JlLmpzCisrKyBiL3dlYi9wZ2Fk bWluL3Rvb2xzL3Jlc3RvcmUvc3RhdGljL2pzL3Jlc3RvcmUuanMKQEAgLTI1LDE5ICsyNSw2IEBA IGNvbW1vblV0aWxzLCBtZW51VXRpbHMsIHN1cHBvcnRlZE5vZGVzLCByZXN0b3JlRGlhbG9nCiAg IH0KIAogICBCYWNrZm9ybS5DdXN0b21Td2l0Y2hDb250cm9sID0gQmFja2Zvcm0uU3dpdGNoQ29u dHJvbC5leHRlbmQoewotICAgIHRlbXBsYXRlOiBfLnRlbXBsYXRlKFsKLSAgICAgICc8bGFiZWwg Y2xhc3M9IjwlPUJhY2tmb3JtLmNvbnRyb2xMYWJlbENsYXNzTmFtZSU+IGN1c3RvbV9zd2l0Y2hf bGFiZWxfY2xhc3MiPjwlPWxhYmVsJT48L2xhYmVsPicsCi0gICAgICAnPGRpdiBjbGFzcz0iPCU9 QmFja2Zvcm0uY29udHJvbHNDbGFzc05hbWUlPiBjdXN0b21fc3dpdGNoX2NvbnRyb2xfY2xhc3Mi PicsCi0gICAgICAnICA8ZGl2IGNsYXNzPSJjaGVja2JveCI+JywKLSAgICAgICcgICAgPGxhYmVs PicsCi0gICAgICAnICAgICAgPGlucHV0IHR5cGU9ImNoZWNrYm94IiBjbGFzcz0iPCU9ZXh0cmFD bGFzc2VzLmpvaW4oXCcgXCcpJT4iIG5hbWU9IjwlPW5hbWUlPiIgPCU9dmFsdWUgPyAiY2hlY2tl ZD1cJ2NoZWNrZWRcJyIgOiAiIiU+IDwlPWRpc2FibGVkID8gImRpc2FibGVkIiA6ICIiJT4gPCU9 cmVxdWlyZWQgPyAicmVxdWlyZWQiIDogIiIlPiAvPicsCi0gICAgICAnICAgIDwvbGFiZWw+JywK LSAgICAgICcgIDwvZGl2PicsCi0gICAgICAnPC9kaXY+JywKLSAgICAgICc8JSBpZiAoaGVscE1l c3NhZ2UgJiYgaGVscE1lc3NhZ2UubGVuZ3RoKSB7ICU+JywKLSAgICAgICcgIDxzcGFuIGNsYXNz PSI8JT1CYWNrZm9ybS5oZWxwTWVzc2FnZUNsYXNzTmFtZSU+Ij48JT1oZWxwTWVzc2FnZSU+PC9z cGFuPicsCi0gICAgICAnPCUgfSAlPicsCi0gICAgXS5qb2luKCdcbicpKSwKICAgICBjbGFzc05h bWU6ICdwZ2FkbWluLWNvbnRyb2wtZ3JvdXAgZm9ybS1ncm91cCBwZy1lbC1tZC02IHJvdycsCiAg IH0pOwogCmRpZmYgLS1naXQgYS93ZWIvd2VicGFjay5zaGltLmpzIGIvd2ViL3dlYnBhY2suc2hp bS5qcwppbmRleCBkYjQ1MTY2Zi4uYmUyNDQ5NDkgMTAwNjQ0Ci0tLSBhL3dlYi93ZWJwYWNrLnNo aW0uanMKKysrIGIvd2ViL3dlYnBhY2suc2hpbS5qcwpAQCAtMzcsOSArMzcsOSBAQCB2YXIgd2Vi cGFja1NoaW1Db25maWcgPSB7CiAgICAgICAnZGVwcyc6IFsnbW9tZW50J10sCiAgICAgICAnZXhw b3J0cyc6ICdqUXVlcnkuZm4uZGF0ZXRpbWVwaWNrZXInLAogICAgIH0sCi0gICAgJ2Jvb3RzdHJh cC5zd2l0Y2gnOiB7CisgICAgJ2Jvb3RzdHJhcC50b2dnbGUnOiB7CiAgICAgICBkZXBzOiBbJ2px dWVyeScsICdib290c3RyYXAnXSwKLSAgICAgICdleHBvcnRzJzogJyQuZm4uYm9vdHN0cmFwU3dp dGNoJywKKyAgICAgICdleHBvcnRzJzogJyQuZm4uYm9vdHN0cmFwVG9nZ2xlJywKICAgICB9LAog ICAgICdiYWNrYm9uZSc6IHsKICAgICAgIGV4cG9ydHM6ICdCYWNrYm9uZScsIC8vIE9uY2UgbG9h ZGVkLCB1c2UgdGhlIGdsb2JhbCAnQmFja2JvbmUnIGFzIHRoZSBtb2R1bGUgdmFsdWUuCkBAIC01 MywxMCArNTMsMTAgQEAgdmFyIHdlYnBhY2tTaGltQ29uZmlnID0gewogICAgICAgJ2V4cG9ydHMn OiAnQmFja2dyaWQnLAogICAgIH0sCiAgICAgJ3BnYWRtaW4uYmFja2Zvcm0nOiB7Ci0gICAgICAn ZGVwcyc6IFsnYmFja2Zvcm0nLCAncGdhZG1pbi5iYWNrZ3JpZCcsICdzZWxlY3QyJ10sCisgICAg ICAnZGVwcyc6IFsnYmFja2Zvcm0nLCAncGdhZG1pbi5iYWNrZ3JpZCcsICdzZWxlY3QyJywgJ2Jv b3RzdHJhcC50b2dnbGUnXSwKICAgICB9LAogICAgICdwZ2FkbWluLmJhY2tncmlkJzogewotICAg ICAgJ2RlcHMnOiBbJ2JhY2tncmlkJywgJ2Jvb3RzdHJhcC5kYXRldGltZXBpY2tlcicsICdib290 c3RyYXAuc3dpdGNoJ10sCisgICAgICAnZGVwcyc6IFsnYmFja2dyaWQnLCAnYm9vdHN0cmFwLmRh dGV0aW1lcGlja2VyJywgJ2Jvb3RzdHJhcC50b2dnbGUnXSwKICAgICB9LAogCiAgICAgJ2JhY2tn cmlkLnNlbGVjdC5hbGwnOiB7CkBAIC0xNzIsNyArMTcyLDcgQEAgdmFyIHdlYnBhY2tTaGltQ29u ZmlnID0gewogICAgICdiYWNrZm9ybSc6IHBhdGguam9pbihfX2Rpcm5hbWUsICcuL3BnYWRtaW4v c3RhdGljL3ZlbmRvci9iYWNrZm9ybS9iYWNrZm9ybScpLAogICAgICdiYWNrZ3JpZCc6IHBhdGgu am9pbihfX2Rpcm5hbWUsICcuL25vZGVfbW9kdWxlcy9iYWNrZ3JpZC9saWIvYmFja2dyaWQnKSwK ICAgICAnYm9vdHN0cmFwLmRhdGV0aW1lcGlja2VyJzogcGF0aC5qb2luKF9fZGlybmFtZSwgJy4v bm9kZV9tb2R1bGVzL3RlbXB1c2RvbWludXMtYm9vdHN0cmFwLTQvYnVpbGQvanMvdGVtcHVzZG9t aW51cy1ib290c3RyYXAtNC5taW4nKSwKLSAgICAnYm9vdHN0cmFwLnN3aXRjaCc6IHBhdGguam9p bihfX2Rpcm5hbWUsICcuL25vZGVfbW9kdWxlcy9ib290c3RyYXAtc3dpdGNoL2Rpc3QvanMvYm9v dHN0cmFwLXN3aXRjaCcpLAorICAgICdib290c3RyYXAudG9nZ2xlJzogcGF0aC5qb2luKF9fZGly bmFtZSwgJy4vbm9kZV9tb2R1bGVzL2Jvb3RzdHJhcDQtdG9nZ2xlL2pzL2Jvb3RzdHJhcDQtdG9n Z2xlJyksCiAgICAgJ3NlbGVjdDInOiBwYXRoLmpvaW4oX19kaXJuYW1lLCAnLi9ub2RlX21vZHVs ZXMvc2VsZWN0Mi9kaXN0L2pzL3NlbGVjdDIuZnVsbCcpLAogICAgICdiYWNrZ3JpZC5maWx0ZXIn OiBwYXRoLmpvaW4oX19kaXJuYW1lLCAnLi9ub2RlX21vZHVsZXMvYmFja2dyaWQtZmlsdGVyL2Jh Y2tncmlkLWZpbHRlcicpLAogICAgICdiYWNrZ3JpZC5zaXplYWJsZS5jb2x1bW5zJzogcGF0aC5q b2luKF9fZGlybmFtZSwgJy4vbm9kZV9tb2R1bGVzL2JhY2tncmlkLXNpemVhYmxlLWNvbHVtbnMv YmFja2dyaWQtc2l6ZWFibGUtY29sdW1ucycpLApkaWZmIC0tZ2l0IGEvd2ViL3dlYnBhY2sudGVz dC5jb25maWcuanMgYi93ZWIvd2VicGFjay50ZXN0LmNvbmZpZy5qcwppbmRleCA2Y2NlNzY2Yy4u YjY1ZTkyNGEgMTAwNjQ0Ci0tLSBhL3dlYi93ZWJwYWNrLnRlc3QuY29uZmlnLmpzCisrKyBiL3dl Yi93ZWJwYWNrLnRlc3QuY29uZmlnLmpzCkBAIC03Nyw3ICs3Nyw3IEBAIG1vZHVsZS5leHBvcnRz ID0gewogICAgICAgJ3NwZWN0cnVtJzogcGF0aC5qb2luKF9fZGlybmFtZSwgJy4vbm9kZV9tb2R1 bGVzL3NwZWN0cnVtLWNvbG9ycGlja2VyL3NwZWN0cnVtJyksCiAgICAgICAnYmlnbnVtYmVyJzog cGF0aC5qb2luKF9fZGlybmFtZSwgJy4vbm9kZV9tb2R1bGVzL2JpZ251bWJlci5qcy9iaWdudW1i ZXInKSwKICAgICAgICdib290c3RyYXAuZGF0ZXRpbWVwaWNrZXInOiBwYXRoLmpvaW4oX19kaXJu YW1lLCAnLi9ub2RlX21vZHVsZXMvdGVtcHVzZG9taW51cy1ib290c3RyYXAtNC9idWlsZC9qcy90 ZW1wdXNkb21pbnVzLWJvb3RzdHJhcC00Lm1pbicpLAotICAgICAgJ2Jvb3RzdHJhcC5zd2l0Y2gn OiBwYXRoLmpvaW4oX19kaXJuYW1lLCAnLi9ub2RlX21vZHVsZXMvYm9vdHN0cmFwLXN3aXRjaC9k aXN0L2pzL2Jvb3RzdHJhcC1zd2l0Y2gnKSwKKyAgICAgICdib290c3RyYXAudG9nZ2xlJzogcGF0 aC5qb2luKF9fZGlybmFtZSwgJy4vbm9kZV9tb2R1bGVzL2Jvb3RzdHJhcDQtdG9nZ2xlL2pzL2Jv b3RzdHJhcDQtdG9nZ2xlJyksCiAgICAgICAnYmFja2JvbmUnOiBwYXRoLmpvaW4oX19kaXJuYW1l LCAnLi9ub2RlX21vZHVsZXMvYmFja2JvbmUvYmFja2JvbmUnKSwKICAgICAgICdiYWNrZm9ybSc6 IHBhdGguam9pbihfX2Rpcm5hbWUsICcuL25vZGVfbW9kdWxlcy9iYWNrZm9ybS9zcmMvYmFja2Zv cm0nKSwKICAgICAgICdiYWNrZ3JpZCc6IHBhdGguam9pbihfX2Rpcm5hbWUsICcuL25vZGVfbW9k dWxlcy9iYWNrZ3JpZC9saWIvYmFja2dyaWQnKSwK --0000000000004caa77057f68ece7--