ZGlmZiAtLWdpdCBhL2t1YmVybmV0ZXMvYWFpL2NvbXBvbmVudHMvYWFpLXJlc291cmNlcy9DaGFydC55YW1sIGIva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL0NoYXJ0LnlhbWwKaW5kZXggZmM4YWQ5Ny4uMzYyZTBlNCAxMDA2NDQKLS0tIGEva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL0NoYXJ0LnlhbWwKKysrIGIva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL0NoYXJ0LnlhbWwKQEAgLTEsNiArMSw2IEBACiAjIENvcHlyaWdodCDCqSAyMDE4IEFtZG9jcywgQmVsbCBDYW5hZGEsIEFUJlQKICMgTW9kaWZpY2F0aW9ucyBDb3B5cmlnaHQgwqkgMjAyMSBPcmFuZ2UKLSMgTW9kaWZpY2F0aW9ucyBDb3B5cmlnaHQgwqkgMjAyMSBOb3JkaXggRm91bmRhdGlvbgorIyBNb2RpZmljYXRpb25zIENvcHlyaWdodCDCqSAyMDIxLTIwMjMgTm9yZGl4IEZvdW5kYXRpb24KICMKICMgTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CiAjIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KQEAgLTIzLDEyICsyMyw2IEBACiBkZXBlbmRlbmNpZXM6CiAgIC0gbmFtZTogY29tbW9uCiAgICAgdmVyc2lvbjogfjEyLngtMAotICAgICMgbG9jYWwgcmVmZXJlbmNlIHRvIGNvbW1vbiBjaGFydCwgYXMgaXQgaXMKLSAgICAjIGEgcGFydCBvZiB0aGlzIGNoYXJ0J3MgcGFja2FnZSBhbmQgd2lsbCBub3QKLSAgICAjIGJlIHB1Ymxpc2hlZCBpbmRlcGVuZGVudGx5IHRvIGEgcmVwbyAoYXQgdGhpcyBwb2ludCkKLSAgICByZXBvc2l0b3J5OiAnQGxvY2FsJwotICAtIG5hbWU6IGNlcnRJbml0aWFsaXplcgotICAgIHZlcnNpb246IH4xMi54LTAKICAgICByZXBvc2l0b3J5OiAnQGxvY2FsJwogICAtIG5hbWU6IHJlcG9zaXRvcnlHZW5lcmF0b3IKICAgICB2ZXJzaW9uOiB+MTIueC0wCmRpZmYgLS1naXQgYS9rdWJlcm5ldGVzL2FhaS9jb21wb25lbnRzL2FhaS1yZXNvdXJjZXMvcmVzb3VyY2VzL2NvbmZpZy9hYWYvYmF0aF9jb25maWcuY3N2IGIva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL3Jlc291cmNlcy9jb25maWcvYWFmL2JhdGhfY29uZmlnLmNzdgpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZWM2MGVmNy4uMDAwMDAwMAotLS0gYS9rdWJlcm5ldGVzL2FhaS9jb21wb25lbnRzL2FhaS1yZXNvdXJjZXMvcmVzb3VyY2VzL2NvbmZpZy9hYWYvYmF0aF9jb25maWcuY3N2CisrKyAvZGV2L251bGwKQEAgLTEsMjcgKzAsMCBAQAotIyBBQUkgLT4gYWFpQGFhaS5vbmFwLm9yZwotQmFzaWMgUVVGSk9rRkJTUT09LEJhc2ljIFlXRnBRR0ZoYVM1dmJtRndMbTl5Wnpwa1pXMXZNVEl6TkRVMklRPT0sMjA1MC0wMy0wMwotCi0jIE1vZGVsTG9hZGVyIC0+IGFhaUBhYWkub25hcC5vcmcKLUJhc2ljIFRXOWtaV3hNYjJGa1pYSTZUVzlrWld4TWIyRmtaWEk9LEJhc2ljIFlXRnBRR0ZoYVM1dmJtRndMbTl5Wnpwa1pXMXZNVEl6TkRVMklRPT0sMjA1MC0wMy0wMwotCi0jIEFhaVVJIC0+IGFhaUBhYWkub25hcC5vcmcsCi1CYXNpYyBRV0ZwVlVrNlFXRnBWVWs9LEJhc2ljIFlXRnBRR0ZoYVM1dmJtRndMbTl5Wnpwa1pXMXZNVEl6TkRVMklRPT0sMjA1MC0wMy0wMwotCi0jIE1TTyAtPiBzb0Bzby5vbmFwLm9yZwotQmFzaWMgVFZOUE9rMVRUdz09LEJhc2ljIGMyOUFjMjh1YjI1aGNDNXZjbWM2WkdWdGJ6RXlNelExTmlFPSwyMDUwLTAzLTAzCi0KLSMgU0ROQyAtPiBzZG5jQHNkbmMub25hcC5vcmcKLUJhc2ljIFUwUk9RenBUUkU1RCxCYXNpYyBjMlJ1WTBCelpHNWpMbTl1WVhBdWIzSm5PbVJsYlc4eE1qTTBOVFloLDIwNTAtMDMtMDMKLQotIyBEQ0FFIC0+IGRjYWVAZGNhZS5vbmFwLm9yZwotQmFzaWMgUkVOQlJUcEVRMEZGLEJhc2ljIFpHTmhaVUJrWTJGbExtOXVZWEF1YjNKbk9tUmxiVzh4TWpNME5UWWgsMjA1MC0wMy0wMwotCi0jIFBPTElDWSAtPiBwb2xpY3lAcG9saWN5Lm9uYXAub3JnCi1CYXNpYyBVRTlNU1VOWk9sQlBURWxEV1E9PSxCYXNpYyBjRzlzYVdONVFIQnZiR2xqZVM1dmJtRndMbTl5Wnpwa1pXMXZNVEl6TkRVMklRPT0sMjA1MC0wMy0wMwotCi0jIEFTREMgLT4gc2RjQHNkYy5vbmFwLm9yZwotQmFzaWMgUVZORVF6cEJVMFJELEJhc2ljIGMyUmpRSE5rWXk1dmJtRndMbTl5Wnpwa1pXMXZNVEl6TkRVMklRPT0sMjA1MC0wMy0wMwotCi0jIE9PRiAtPiBvb2ZAb29mLm9uYXAub3JnCi1CYXNpYyBUMDlHT2s5UFJnPT0sQmFzaWMgYjI5bVFHOXZaaTV2Ym1Gd0xtOXlaenBrWlcxdk1USXpORFEySVE9PSwyMDUwLTAzLTAzCi0KZGlmZiAtLWdpdCBhL2t1YmVybmV0ZXMvYWFpL2NvbXBvbmVudHMvYWFpLXJlc291cmNlcy9yZXNvdXJjZXMvY29uZmlnL2FhZi9jYWRpLnByb3BlcnRpZXMgYi9rdWJlcm5ldGVzL2FhaS9jb21wb25lbnRzL2FhaS1yZXNvdXJjZXMvcmVzb3VyY2VzL2NvbmZpZy9hYWYvY2FkaS5wcm9wZXJ0aWVzCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBlYzVmZDU1Li4wMDAwMDAwCi0tLSBhL2t1YmVybmV0ZXMvYWFpL2NvbXBvbmVudHMvYWFpLXJlc291cmNlcy9yZXNvdXJjZXMvY29uZmlnL2FhZi9jYWRpLnByb3BlcnRpZXMKKysrIC9kZXYvbnVsbApAQCAtMSw4ICswLDAgQEAKLQotY2FkaV9sb2dsZXZlbD1JTkZPCi1jYWRpX3Byb3BfZmlsZXM9L29wdC9hcHAvYWFpLXJlc291cmNlcy9yZXNvdXJjZXMvYWFmL29yZy5vc2FhZi5sb2NhdGlvbi5wcm9wczovb3B0L2FwcC9hYWktcmVzb3VyY2VzL3Jlc291cmNlcy9hYWYvb3JnLm9uYXAuYWFpLnByb3BzCi0KLSMgT0F1dGgyCi1hYWZfb2F1dGgyX3Rva2VuX3VybD1odHRwczovL0FBRl9MT0NBVEVfVVJML29uYXAub3JnLm9zYWFmLmFhZi50b2tlbjoyLjEvdG9rZW4KLWFhZl9vYXV0aDJfaW50cm9zcGVjdF91cmw9aHR0cHM6Ly9BQUZfTE9DQVRFX1VSTC9vbmFwLm9yZy5vc2FhZi5hYWYuaW50cm9zcGVjdDoyLjEvaW50cm9zcGVjdAotCmRpZmYgLS1naXQgYS9rdWJlcm5ldGVzL2FhaS9jb21wb25lbnRzL2FhaS1yZXNvdXJjZXMvcmVzb3VyY2VzL2NvbmZpZy9hYWYvb3JnLm9uYXAuYWFpLnByb3BzIGIva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL3Jlc291cmNlcy9jb25maWcvYWFmL29yZy5vbmFwLmFhaS5wcm9wcwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZjRiYjllZS4uMDAwMDAwMAotLS0gYS9rdWJlcm5ldGVzL2FhaS9jb21wb25lbnRzL2FhaS1yZXNvdXJjZXMvcmVzb3VyY2VzL2NvbmZpZy9hYWYvb3JnLm9uYXAuYWFpLnByb3BzCisrKyAvZGV2L251bGwKQEAgLTEsMTUgKzAsMCBAQAotIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCi0jIFByb3BlcnRpZXMgR2VuZXJhdGVkIGJ5IEFUJlQgQ2VydGlmaWNhdGUgTWFuYWdlcgotIyBAY29weXJpZ2h0IDIwMTYsIEFUJlQKLSMgTW9kaWZpY2F0aW9ucyBDb3B5cmlnaHQgwqkgMjAyMCBPcmFuZ2UKLSMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotY2FkaV94NTA5X2lzc3VlcnM9Q049aW50ZXJtZWRpYXRlQ0FfMSwgT1U9T1NBQUYsIE89T05BUCwgQz1VUzpDTj1pbnRlcm1lZGlhdGVDQV83LCBPVT1PU0FBRiwgTz1PTkFQLCBDPVVTOkNOPWludGVybWVkaWF0ZUNBXzksIE9VPU9TQUFGLCBPPU9OQVAsIEM9VVMKLWNhZGlfa2V5ZmlsZT17eyAuVmFsdWVzLmNlcnRJbml0aWFsaXplci5jcmVkc1BhdGggfX0ve3sgLlZhbHVlcy5jZXJ0SW5pdGlhbGl6ZXIuZnFpX25hbWVzcGFjZSB9fS5rZXlmaWxlCi1jYWRpX2tleXN0b3JlPXt7IC5WYWx1ZXMuY2VydEluaXRpYWxpemVyLmNyZWRzUGF0aCB9fS97eyAuVmFsdWVzLmNlcnRJbml0aWFsaXplci5mcWlfbmFtZXNwYWNlIH19LnAxMgotY2FkaV9rZXlzdG9yZV9wYXNzd29yZD0ke0tFWVNUT1JFX1BBU1NXT1JEfQotCi1jYWRpX2FsaWFzPWFhaUBhYWkub25hcC5vcmcKLWNhZGlfdHJ1c3RzdG9yZT17eyAuVmFsdWVzLmNlcnRJbml0aWFsaXplci5jcmVkc1BhdGggfX0vdHJ1c3RzdG9yZU9OQVBhbGwuamtzCi1jYWRpX3RydXN0c3RvcmVfcGFzc3dvcmQ9JHtUUlVTVFNUT1JFX0FMTF9QQVNTV09SRH0KLWNhZGlfbG9nbGV2ZWw9SU5GTwotY2FkaV9iYXRoX2NvbnZlcnQ9L29wdC9hcHAvYWFpLXJlc291cmNlcy9yZXNvdXJjZXMvYWFmL2JhdGhfY29uZmlnLmNzdgpkaWZmIC0tZ2l0IGEva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL3Jlc291cmNlcy9jb25maWcvYWFmL29yZy5vc2FhZi5sb2NhdGlvbi5wcm9wcyBiL2t1YmVybmV0ZXMvYWFpL2NvbXBvbmVudHMvYWFpLXJlc291cmNlcy9yZXNvdXJjZXMvY29uZmlnL2FhZi9vcmcub3NhYWYubG9jYXRpb24ucHJvcHMKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDhhZTY2YWEuLjAwMDAwMDAKLS0tIGEva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL3Jlc291cmNlcy9jb25maWcvYWFmL29yZy5vc2FhZi5sb2NhdGlvbi5wcm9wcworKysgL2Rldi9udWxsCkBAIC0xLDI0ICswLDAgQEAKLSMjCi0jIyBvcmcub3NhYWYubG9jYXRpb24ucHJvcHMKLSMjCi0jIyBMb2NhbGl6ZWQgTWFjaGluZSBJbmZvcm1hdGlvbgotIyMKLSMgQWxtZWRhIENhbGlmb3JuaWEgPwotY2FkaV9sYXRpdHVkZT0zNy43ODE4NwotY2FkaV9sb25naXR1ZGU9LTEyMi4yNjE0NwotCi0jIExvY2F0ZSBVUkwgKHdoaWNoIEFBRiBFbnYpCi1hYWZfbG9jYXRlX3VybD1odHRwczovL2FhZi1sb2NhdGUue3suUmVsZWFzZS5OYW1lc3BhY2V9fTo4MDk1Ci0KLQotIyBBQUYgVVJMCi1hYWZfdXJsPWh0dHBzOi8vQUFGX0xPQ0FURV9VUkwvb25hcC5vcmcub3NhYWYuYWFmLnNlcnZpY2U6Mi4xCi0KLSMgQUFGIEVudmlyb25tZW50IERlc2lnbmF0aW9uCi1hYWZfZW52PURFVgotCi0jIE9BdXRoMiBFbmRwb2ludHMKLWFhZl9vYXV0aDJfdG9rZW5fdXJsPWh0dHBzOi8vQUFGX0xPQ0FURV9VUkwvb25hcC5vcmcub3NhYWYuYWFmLnRva2VuOjIuMS90b2tlbgotYWFmX29hdXRoMl9pbnRyb3NwZWN0X3VybD1odHRwczovL0FBRl9MT0NBVEVfVVJML29uYXAub3JnLm9zYWFmLmFhZi5pbnRyb3NwZWN0OjIuMS9pbnRyb3NwZWN0Ci0KLQpkaWZmIC0tZ2l0IGEva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL3Jlc291cmNlcy9jb25maWcvYWFmL3Blcm1pc3Npb25zLnByb3BlcnRpZXMgYi9rdWJlcm5ldGVzL2FhaS9jb21wb25lbnRzL2FhaS1yZXNvdXJjZXMvcmVzb3VyY2VzL2NvbmZpZy9hYWYvcGVybWlzc2lvbnMucHJvcGVydGllcwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNDIzNDEyMS4uMDAwMDAwMAotLS0gYS9rdWJlcm5ldGVzL2FhaS9jb21wb25lbnRzL2FhaS1yZXNvdXJjZXMvcmVzb3VyY2VzL2NvbmZpZy9hYWYvcGVybWlzc2lvbnMucHJvcGVydGllcworKysgL2Rldi9udWxsCkBAIC0xLDIgKzAsMCBAQAotcGVybWlzc2lvbi50eXBlPW9yZy5vbmFwLmFhaS5yZXNvdXJjZXMKLXBlcm1pc3Npb24uaW5zdGFuY2U9KgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL2t1YmVybmV0ZXMvYWFpL2NvbXBvbmVudHMvYWFpLXJlc291cmNlcy9yZXNvdXJjZXMvY29uZmlnL2FhaWNvbmZpZy5wcm9wZXJ0aWVzIGIva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL3Jlc291cmNlcy9jb25maWcvYWFpY29uZmlnLnByb3BlcnRpZXMKaW5kZXggYTU2OWI1My4uYWRhYmFlMyAxMDA2NDQKLS0tIGEva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL3Jlc291cmNlcy9jb25maWcvYWFpY29uZmlnLnByb3BlcnRpZXMKKysrIGIva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL3Jlc291cmNlcy9jb25maWcvYWFpY29uZmlnLnByb3BlcnRpZXMKQEAgLTUsNiArNSw3IEBACiAjID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CiAjIENvcHlyaWdodCDCqSAyMDE3IEFUJlQgSW50ZWxsZWN0dWFsIFByb3BlcnR5LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIyBNb2RpZmljYXRpb25zIENvcHlyaWdodCDCqSAyMDIwIE9yYW5nZQorIyBNb2RpZmljYXRpb25zIENvcHlyaWdodCCpIDIwMjMgTm9yZGl4IEZvdW5kYXRpb24KICMgPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KICMgTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CiAjIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KQEAgLTM4LDE1ICszOSw5IEBACiAjIHRoaXMgY291bGQgY29tZSBmcm9tIHNpdGVjb25maWcucGw/CiBhYWkuY29uZmlnLm5vZGVuYW1lPUF1dG9tYXRpY2FsbHlPdmVyd3JpdHRlbgogCi17eyBpZiAoIGluY2x1ZGUgImNvbW1vbi5uZWVkVExTIiAuKSB9fQotYWFpLnNlcnZlci51cmwuYmFzZT1odHRwczovL2FhaS57eyBpbmNsdWRlICJjb21tb24ubmFtZXNwYWNlIiAuIH19Ojg0NDMvYWFpLwotYWFpLnNlcnZlci51cmw9aHR0cHM6Ly9hYWkue3sgaW5jbHVkZSAiY29tbW9uLm5hbWVzcGFjZSIgLiB9fTo4NDQzL2FhaS97eyAuVmFsdWVzLmdsb2JhbC5jb25maWcuc2NoZW1hLnZlcnNpb24uYXBpLmRlZmF1bHQgfX0vCi1hYWkuZ2xvYmFsLmNhbGxiYWNrLnVybD1odHRwczovL2FhaS57eyBpbmNsdWRlICJjb21tb24ubmFtZXNwYWNlIiAuIH19Ojg0NDMvYWFpLwote3sgZWxzZSB9fQogYWFpLnNlcnZlci51cmwuYmFzZT1odHRwOi8vYWFpLnt7IGluY2x1ZGUgImNvbW1vbi5uYW1lc3BhY2UiIC4gfX0vYWFpLwogYWFpLnNlcnZlci51cmw9aHR0cDovL2FhaS57eyBpbmNsdWRlICJjb21tb24ubmFtZXNwYWNlIiAuIH19L2FhaS97eyAuVmFsdWVzLmdsb2JhbC5jb25maWcuc2NoZW1hLnZlcnNpb24uYXBpLmRlZmF1bHQgfX0vCiBhYWkuZ2xvYmFsLmNhbGxiYWNrLnVybD1odHRwOi8vYWFpLnt7IGluY2x1ZGUgImNvbW1vbi5uYW1lc3BhY2UiIC4gfX0vYWFpLwote3sgZW5kIH19CiAKIHt7IGlmIC5WYWx1ZXMuZ2xvYmFsLmNvbmZpZy5iYXNpYy5hdXRoLmVuYWJsZWQgfX0KIGFhaS50b29scy5lbmFibGVCYXNpY0F1dGg9dHJ1ZQpAQCAtNTQsMTMgKzQ5LDYgQEAKIGFhaS50b29scy5wYXNzd29yZD17eyAuVmFsdWVzLmdsb2JhbC5jb25maWcuYmFzaWMuYXV0aC5wYXNzd2QgfX0KIHt7IGVuZCB9fQogCi17eyBpZiAoIGluY2x1ZGUgImNvbW1vbi5uZWVkVExTIiAuKSB9fQotYWFpLnRydXN0c3RvcmUuZmlsZW5hbWU9e3sgLlZhbHVlcy5jZXJ0SW5pdGlhbGl6ZXIuY3JlZHNQYXRoIH19L3t7IC5WYWx1ZXMuY2VydEluaXRpYWxpemVyLmZxaV9uYW1lc3BhY2UgfX0udHJ1c3QuamtzCi1hYWkudHJ1c3RzdG9yZS5wYXNzd2QueD0ke1RSVVNUU1RPUkVfUEFTU1dPUkR9Ci1hYWkua2V5c3RvcmUuZmlsZW5hbWU9e3sgLlZhbHVlcy5jZXJ0SW5pdGlhbGl6ZXIuY3JlZHNQYXRoIH19L3t7IC5WYWx1ZXMuY2VydEluaXRpYWxpemVyLmZxaV9uYW1lc3BhY2UgfX0ucDEyCi1hYWkua2V5c3RvcmUucGFzc3dkLng9JHtLRVlTVE9SRV9QQVNTV09SRH0KLXt7IGVuZCB9fQotCiBhYWkubm90aWZpY2F0aW9uLmN1cnJlbnQudmVyc2lvbj17eyAuVmFsdWVzLmdsb2JhbC5jb25maWcuc2NoZW1hLnZlcnNpb24uYXBpLmRlZmF1bHQgfX0KIGFhaS5ub3RpZmljYXRpb25FdmVudC5kZWZhdWx0LnN0YXR1cz1VTlBST0NFU1NFRAogYWFpLm5vdGlmaWNhdGlvbkV2ZW50LmRlZmF1bHQuZXZlbnRUeXBlPXt7IC5WYWx1ZXMuZ2xvYmFsLmNvbmZpZy5ub3RpZmljYXRpb24uZXZlbnRUeXBlIH19CmRpZmYgLS1naXQgYS9rdWJlcm5ldGVzL2FhaS9jb21wb25lbnRzL2FhaS1yZXNvdXJjZXMvcmVzb3VyY2VzL2NvbmZpZy9hcHBsaWNhdGlvbi5wcm9wZXJ0aWVzIGIva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL3Jlc291cmNlcy9jb25maWcvYXBwbGljYXRpb24ucHJvcGVydGllcwppbmRleCBiNWI2NGJlLi40MGI4OWVhIDEwMDY0NAotLS0gYS9rdWJlcm5ldGVzL2FhaS9jb21wb25lbnRzL2FhaS1yZXNvdXJjZXMvcmVzb3VyY2VzL2NvbmZpZy9hcHBsaWNhdGlvbi5wcm9wZXJ0aWVzCisrKyBiL2t1YmVybmV0ZXMvYWFpL2NvbXBvbmVudHMvYWFpLXJlc291cmNlcy9yZXNvdXJjZXMvY29uZmlnL2FwcGxpY2F0aW9uLnByb3BlcnRpZXMKQEAgLTEsNiArMSw3IEBACiB7ey8qCiAjIENvcHlyaWdodCDCqSAyMDE4IEFtZG9jcywgQmVsbCBDYW5hZGEsIEFUJlQKICMgTW9kaWZpY2F0aW9ucyBDb3B5cmlnaHQgwqkgMjAyMCBPcmFuZ2UKKyMgTW9kaWZpY2F0aW9ucyBDb3B5cmlnaHQgqSAyMDIzIE5vcmRpeCBGb3VuZGF0aW9uCiAjCiAjIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwogIyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCkBAIC0yOSw3ICszMCw3IEBACiAKIHNwcmluZy5hdXRvY29uZmlndXJlLmV4Y2x1ZGU9b3JnLnNwcmluZ2ZyYW1ld29yay5ib290LmF1dG9jb25maWd1cmUuamRiYy5EYXRhU291cmNlQXV0b0NvbmZpZ3VyYXRpb24sb3JnLnNwcmluZ2ZyYW1ld29yay5ib290LmF1dG9jb25maWd1cmUub3JtLmpwYS5IaWJlcm5hdGVKcGFBdXRvQ29uZmlndXJhdGlvbixvcmcua2V5Y2xvYWsuYWRhcHRlcnMuc3ByaW5nYm9vdC5LZXljbG9ha0F1dG9Db25maWd1cmF0aW9uLG9yZy5zcHJpbmdmcmFtZXdvcmsuYm9vdC5hdXRvY29uZmlndXJlLnNlY3VyaXR5LnNlcnZsZXQuU2VjdXJpdHlBdXRvQ29uZmlndXJhdGlvbixvcmcuc3ByaW5nZnJhbWV3b3JrLmJvb3QuYWN0dWF0ZS5hdXRvY29uZmlndXJlLnNlY3VyaXR5LnNlcnZsZXQuTWFuYWdlbWVudFdlYlNlY3VyaXR5QXV0b0NvbmZpZ3VyYXRpb24KIAotc3ByaW5nLnByb2ZpbGVzLmFjdGl2ZT17eyAuVmFsdWVzLmdsb2JhbC5jb25maWcucHJvZmlsZXMuYWN0aXZlIH19e3sgLlZhbHVlcy5nbG9iYWwuYWFmRW5hYmxlZCB8IHRlcm5hcnkgIixhYWYtYXV0aCIgIiIgfX0KK3NwcmluZy5wcm9maWxlcy5hY3RpdmU9e3sgLlZhbHVlcy5nbG9iYWwuY29uZmlnLnByb2ZpbGVzLmFjdGl2ZSB9fQogc3ByaW5nLmplcnNleS5hcHBsaWNhdGlvbi1wYXRoPSR7c2NoZW1hLnVyaS5iYXNlLnBhdGh9CiAjVGhlIG1heCBudW1iZXIgb2YgYWN0aXZlIHRocmVhZHMgaW4gdGhpcyBwb29sCiBzZXJ2ZXIudG9tY2F0Lm1heC10aHJlYWRzPTIwMApAQCAtNDQsMjMgKzQ1LDEzIEBACiBzZXJ2ZXIuYmFzaWMuYXV0aC5sb2NhdGlvbj0ke3NlcnZlci5sb2NhbC5zdGFydHBhdGh9ZXRjL2F1dGgvcmVhbG0ucHJvcGVydGllcwogCiBzZXJ2ZXIucG9ydD04NDQ3Ci17eyBpZiAoIGluY2x1ZGUgImNvbW1vbi5uZWVkVExTIiAuKSB9fQotc2VydmVyLnNzbC5lbmFibGVkLXByb3RvY29scz1UTFN2MS4xLFRMU3YxLjIKLXNlcnZlci5zc2wua2V5LXN0b3JlPXt7IC5WYWx1ZXMuY2VydEluaXRpYWxpemVyLmNyZWRzUGF0aCB9fS97eyAuVmFsdWVzLmNlcnRJbml0aWFsaXplci5mcWlfbmFtZXNwYWNlIH19LnAxMgotc2VydmVyLnNzbC5rZXktc3RvcmUtcGFzc3dvcmQ9JHtLRVlTVE9SRV9QQVNTV09SRH0KLXNlcnZlci5zc2wudHJ1c3Qtc3RvcmU9e3sgLlZhbHVlcy5jZXJ0SW5pdGlhbGl6ZXIuY3JlZHNQYXRoIH19L3t7IC5WYWx1ZXMuY2VydEluaXRpYWxpemVyLmZxaV9uYW1lc3BhY2UgfX0udHJ1c3QuamtzCi1zZXJ2ZXIuc3NsLnRydXN0LXN0b3JlLXBhc3N3b3JkPSR7VFJVU1RTVE9SRV9QQVNTV09SRH0KLXNlcnZlci5zc2wuY2xpZW50LWF1dGg9d2FudAotc2VydmVyLnNzbC5rZXktc3RvcmUtdHlwZT1KS1MKLXt7IGVsc2UgfX0KIHNlY3VyaXR5LnJlcXVpcmUtc3NsPWZhbHNlCiBzZXJ2ZXIuc3NsLmVuYWJsZWQ9ZmFsc2UKLXt7IGVuZCB9fQogCiAjIEpNUyBiaW5kIGFkZHJlc3MgaG9zdCBwb3J0CiBqbXMuYmluZC5hZGRyZXNzPXRjcDovL2xvY2FsaG9zdDo2MTY0NwotZG1hYXAucmliYm9uLmxpc3RPZlNlcnZlcnM9bWVzc2FnZS1yb3V0ZXIue3suUmVsZWFzZS5OYW1lc3BhY2V9fTp7eyAoZXEgInRydWUiIChpbmNsdWRlICJjb21tb24ubmVlZFRMUyIgLikpIHwgdGVybmFyeSAzOTA1IDM5MDQgfX0KLWRtYWFwLnJpYmJvbi50cmFuc3BvcnRUeXBlPXt7IGluY2x1ZGUgImNvbW1vbi5zY2hlbWUiIC4gfX0KK2RtYWFwLnJpYmJvbi5saXN0T2ZTZXJ2ZXJzPW1lc3NhZ2Utcm91dGVyLnt7IGluY2x1ZGUgImNvbW1vbi5uYW1lc3BhY2UiIC4gfX06MzkwNAorZG1hYXAucmliYm9uLnRyYW5zcG9ydFR5cGU9aHR0cAogCiAjIFNjaGVtYSByZWxhdGVkIGF0dHJpYnV0ZXMgZm9yIHRoZSBveG0gYW5kIGVkZ2VzCiAjIEFueSBhZGRpdGlvbmFsIHNjaGVtYSByZWxhdGVkIGF0dHJpYnV0ZXMgc2hvdWxkIHN0YXJ0IHdpdGggcHJlZml4IHNjaGVtYQpAQCAtOTYsMTQgKzg3LDcgQEAKIHNjaGVtYS5zZXJ2aWNlLm5vZGVzLmVuZHBvaW50PW5vZGVzP3ZlcnNpb249CiBzY2hlbWEuc2VydmljZS5lZGdlcy5lbmRwb2ludD1lZGdlcnVsZXM/dmVyc2lvbj0KIHNjaGVtYS5zZXJ2aWNlLnZlcnNpb25zLmVuZHBvaW50PXZlcnNpb25zCi1zY2hlbWEuc2VydmljZS5jbGllbnQ9e3sgKGVxICJ0cnVlIiAoIGluY2x1ZGUgImNvbW1vbi5uZWVkVExTIiAuKSkgfCB0ZXJuYXJ5IC5WYWx1ZXMuZ2xvYmFsLmNvbmZpZy5zY2hlbWEuc2VydmljZS5jbGllbnQgIm5vLWF1dGgiIH19Ci0KLXt7IGlmICggaW5jbHVkZSAiY29tbW9uLm5lZWRUTFMiIC4pIH19Ci1zY2hlbWEuc2VydmljZS5zc2wua2V5LXN0b3JlPXt7IC5WYWx1ZXMuY2VydEluaXRpYWxpemVyLmNyZWRzUGF0aCB9fS97eyAuVmFsdWVzLmNlcnRJbml0aWFsaXplci5mcWlfbmFtZXNwYWNlIH19LnAxMgotc2NoZW1hLnNlcnZpY2Uuc3NsLnRydXN0LXN0b3JlPXt7IC5WYWx1ZXMuY2VydEluaXRpYWxpemVyLmNyZWRzUGF0aCB9fS97eyAuVmFsdWVzLmNlcnRJbml0aWFsaXplci5mcWlfbmFtZXNwYWNlIH19LnRydXN0Lmprcwotc2NoZW1hLnNlcnZpY2Uuc3NsLmtleS1zdG9yZS1wYXNzd29yZD0ke0tFWVNUT1JFX1BBU1NXT1JEfQotc2NoZW1hLnNlcnZpY2Uuc3NsLnRydXN0LXN0b3JlLXBhc3N3b3JkPSR7VFJVU1RTVE9SRV9QQVNTV09SRH0KLXt7IGVuZCB9fQorc2NoZW1hLnNlcnZpY2UuY2xpZW50PW5vLWF1dGgKIAogI3RvIGV4cG9zZSB0aGUgUHJvbWV0aGV1cyBzY3JhcGluZyBlbmRwb2ludAogbWFuYWdlbWVudC5wb3J0PTg0NDgKZGlmZiAtLWdpdCBhL2t1YmVybmV0ZXMvYWFpL2NvbXBvbmVudHMvYWFpLXJlc291cmNlcy90ZW1wbGF0ZXMvY29uZmlnbWFwLnlhbWwgYi9rdWJlcm5ldGVzL2FhaS9jb21wb25lbnRzL2FhaS1yZXNvdXJjZXMvdGVtcGxhdGVzL2NvbmZpZ21hcC55YW1sCmluZGV4IDk5OTczNTYuLmVjY2M0YmEgMTAwNjQ0Ci0tLSBhL2t1YmVybmV0ZXMvYWFpL2NvbXBvbmVudHMvYWFpLXJlc291cmNlcy90ZW1wbGF0ZXMvY29uZmlnbWFwLnlhbWwKKysrIGIva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL3RlbXBsYXRlcy9jb25maWdtYXAueWFtbApAQCAtMzQsMTkgKzM0LDMgQEAKIHt7IHRwbCAoLkZpbGVzLkdsb2IgInJlc291cmNlcy9jb25maWcvYXBwbGljYXRpb24ucHJvcGVydGllcyIpLkFzQ29uZmlnIC4gfCBpbmRlbnQgMiB9fQoge3sgdHBsICguRmlsZXMuR2xvYiAicmVzb3VyY2VzL2NvbmZpZy9hcHBsaWNhdGlvbi1rZXljbG9hay5wcm9wZXJ0aWVzIikuQXNDb25maWcgLiB8IGluZGVudCAyIH19CiB7eyB0cGwgKC5GaWxlcy5HbG9iICJyZXNvdXJjZXMvY29uZmlnL3JlYWxtLnByb3BlcnRpZXMiKS5Bc0NvbmZpZyAuIHwgaW5kZW50IDIgfX0KLS0tLQotYXBpVmVyc2lvbjogdjEKLWtpbmQ6IENvbmZpZ01hcAotbWV0YWRhdGE6Ci0gIG5hbWU6IHt7IGluY2x1ZGUgImNvbW1vbi5mdWxsbmFtZSIgLiB9fS1hYWYtcHJvcHMKLSAgbmFtZXNwYWNlOiB7eyBpbmNsdWRlICJjb21tb24ubmFtZXNwYWNlIiAuIH19Ci0gIGxhYmVsczoKLSAgICBhcHA6IHt7IGluY2x1ZGUgImNvbW1vbi5uYW1lIiAuIH19Ci0gICAgY2hhcnQ6IHt7IC5DaGFydC5OYW1lIH19LXt7IC5DaGFydC5WZXJzaW9uIHwgcmVwbGFjZSAiKyIgIl8iIH19Ci0gICAgcmVsZWFzZToge3sgaW5jbHVkZSAiY29tbW9uLnJlbGVhc2UiIC4gfX0KLSAgICBoZXJpdGFnZToge3sgLlJlbGVhc2UuU2VydmljZSB9fQotZGF0YToKLXt7IHRwbCAoLkZpbGVzLkdsb2IgInJlc291cmNlcy9jb25maWcvYWFmL29yZy5vc2FhZi5sb2NhdGlvbi5wcm9wcyIpLkFzQ29uZmlnIC4gfCBpbmRlbnQgMiB9fQote3sgdHBsICguRmlsZXMuR2xvYiAicmVzb3VyY2VzL2NvbmZpZy9hYWYvcGVybWlzc2lvbnMucHJvcGVydGllcyIpLkFzQ29uZmlnIC4gfCBpbmRlbnQgMiB9fQote3sgdHBsICguRmlsZXMuR2xvYiAicmVzb3VyY2VzL2NvbmZpZy9hYWYvb3JnLm9uYXAuYWFpLnByb3BzIikuQXNDb25maWcgLiB8IGluZGVudCAyIH19Ci17eyB0cGwgKC5GaWxlcy5HbG9iICJyZXNvdXJjZXMvY29uZmlnL2FhZi9jYWRpLnByb3BlcnRpZXMiKS5Bc0NvbmZpZyAuIHwgaW5kZW50IDIgfX0KZGlmZiAtLWdpdCBhL2t1YmVybmV0ZXMvYWFpL2NvbXBvbmVudHMvYWFpLXJlc291cmNlcy90ZW1wbGF0ZXMvZGVwbG95bWVudC55YW1sIGIva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL3RlbXBsYXRlcy9kZXBsb3ltZW50LnlhbWwKaW5kZXggZjRlNTZjMi4uMTEwMDhhZSAxMDA2NDQKLS0tIGEva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL3RlbXBsYXRlcy9kZXBsb3ltZW50LnlhbWwKKysrIGIva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL3RlbXBsYXRlcy9kZXBsb3ltZW50LnlhbWwKQEAgLTMsNiArMyw3IEBACiAjIE1vZGlmaWNhdGlvbnMgQ29weXJpZ2h0IChjKSAyMDE4IEFUJlQKICMgTW9kaWZpY2F0aW9ucyBDb3B5cmlnaHQgKGMpIDIwMjAgTm9raWEKICMgTW9kaWZpY2F0aW9ucyBDb3B5cmlnaHQgKGMpIDIwMjEgT3JhbmdlCisjIE1vZGlmaWNhdGlvbnMgQ29weXJpZ2h0IMKpIDIwMjMgTm9yZGl4IEZvdW5kYXRpb24KICMKICMgTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CiAjIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KQEAgLTc5LDcgKzgwLDcgQEAKICAgICBzcGVjOgogICAgICAgaG9zdG5hbWU6IGFhaS1yZXNvdXJjZXMKICAgICAgIHRlcm1pbmF0aW9uR3JhY2VQZXJpb2RTZWNvbmRzOiB7eyAuVmFsdWVzLnNlcnZpY2UudGVybWluYXRpb25HcmFjZVBlcmlvZFNlY29uZHMgfX0KLSAgICAgIGluaXRDb250YWluZXJzOiB7eyBpbmNsdWRlICJjb21tb24uY2VydEluaXRpYWxpemVyLmluaXRDb250YWluZXIiIC4gfCBuaW5kZW50IDYgfX0KKyAgICAgIGluaXRDb250YWluZXJzOgogICAgICAgLSBuYW1lOiB7eyBpbmNsdWRlICJjb21tb24ubmFtZSIgLiB9fS1yZWFkaW5lc3MKICAgICAgICAgY29tbWFuZDoKICAgICAgICAgLSAvYXBwL3JlYWR5LnB5CkBAIC0xMTksOCArMTIwLDYgQEAKICAgICAgICAgYXJnczoKICAgICAgICAgLSAtYwogICAgICAgICAtIHwKLSAgICAgICAgICBlY2hvICIqKiogcmV0cmlldmUgVHJ1c3RzdG9yZSBhbmQgS2V5c3RvcmUgcGFzc3dvcmQiCi0gICAgICAgICAgZXhwb3J0ICQoY2F0IHt7IC5WYWx1ZXMuY2VydEluaXRpYWxpemVyLmNyZWRzUGF0aCB9fS9teWNyZWRzLnByb3AgfCB4YXJncyAtMCkKICAgICAgICAgICBlY2hvICIqKiogYWN0dWFsIGxhdW5jaCBvZiBBQUkgUmVzb3VyY2VzIgogICAgICAgICAgIC9iaW4vYmFzaCAvb3B0L2FwcC9hYWktcmVzb3VyY2VzL2RvY2tlci1lbnRyeXBvaW50LnNoCiAgICAgICAgIGVudjoKQEAgLTEyOCwxNyArMTI3LDEzIEBACiAgICAgICAgICAgdmFsdWU6IHt7IC5WYWx1ZXMuZ2xvYmFsLmNvbmZpZy51c2VySWQgfCBxdW90ZSB9fQogICAgICAgICAtIG5hbWU6IExPQ0FMX0dST1VQX0lECiAgICAgICAgICAgdmFsdWU6IHt7IC5WYWx1ZXMuZ2xvYmFsLmNvbmZpZy5ncm91cElkIHwgcXVvdGUgfX0KLSAgICAgICAgLSBuYW1lOiBQT1NUX0pBVkFfT1BUUwotICAgICAgICAgIHZhbHVlOiAnLURqYXZheC5uZXQuc3NsLnRydXN0U3RvcmU9e3sgLlZhbHVlcy5jZXJ0SW5pdGlhbGl6ZXIuY3JlZHNQYXRoIH19L3RydXN0c3RvcmVPTkFQYWxsLmprcyAtRGphdmF4Lm5ldC5zc2wudHJ1c3RTdG9yZVBhc3N3b3JkPXt7IC5WYWx1ZXMuY2VydEluaXRpYWxpemVyLnRydXN0c3RvcmVQYXNzd29yZCB9fScKLSAgICAgICAgLSBuYW1lOiBUUlVTVE9SRV9BTExfUEFTU1dPUkQKLSAgICAgICAgICB2YWx1ZToge3sgLlZhbHVlcy5jZXJ0SW5pdGlhbGl6ZXIudHJ1c3RzdG9yZVBhc3N3b3JkIH19CiAgICAgICAgIC0gbmFtZTogSU5URVJOQUxfUE9SVF8xCiAgICAgICAgICAgdmFsdWU6IHt7IC5WYWx1ZXMuc2VydmljZS5pbnRlcm5hbFBvcnQgfCBxdW90ZSB9fQogICAgICAgICAtIG5hbWU6IElOVEVSTkFMX1BPUlRfMgogICAgICAgICAgIHZhbHVlOiB7eyAuVmFsdWVzLnNlcnZpY2UuaW50ZXJuYWxQb3J0MiB8IHF1b3RlIH19CiAgICAgICAgIC0gbmFtZTogSU5URVJOQUxfUE9SVF8zCiAgICAgICAgICAgdmFsdWU6IHt7IC5WYWx1ZXMuc2VydmljZS5pbnRlcm5hbFBvcnQzIHwgcXVvdGUgfX0KLSAgICAgICAgdm9sdW1lTW91bnRzOiB7eyBpbmNsdWRlICJjb21tb24uY2VydEluaXRpYWxpemVyLnZvbHVtZU1vdW50IiAuIHwgbmluZGVudCA4IH19CisgICAgICAgIHZvbHVtZU1vdW50czoKICAgICAgICAgLSBtb3VudFBhdGg6IC9ldGMvbG9jYWx0aW1lCiAgICAgICAgICAgbmFtZTogbG9jYWx0aW1lCiAgICAgICAgICAgcmVhZE9ubHk6IHRydWUKQEAgLTE2MiwyMSArMTU3LDYgQEAKICAgICAgICAgLSBtb3VudFBhdGg6IC9vcHQvYXBwL2FhaS1yZXNvdXJjZXMvcmVzb3VyY2VzL2V0Yy9hdXRoL3JlYWxtLnByb3BlcnRpZXMKICAgICAgICAgICBuYW1lOiB7eyBpbmNsdWRlICJjb21tb24uZnVsbG5hbWUiIC4gfX0tY29uZmlnCiAgICAgICAgICAgc3ViUGF0aDogcmVhbG0ucHJvcGVydGllcwotICAgICAgICAtIG1vdW50UGF0aDogL29wdC9hcHAvYWFpLXJlc291cmNlcy9yZXNvdXJjZXMvYWFmL2JhdGhfY29uZmlnLmNzdgotICAgICAgICAgIG5hbWU6IHt7IGluY2x1ZGUgImNvbW1vbi5mdWxsbmFtZSIgLiB9fS1hYWYtY2VydHMKLSAgICAgICAgICBzdWJQYXRoOiBiYXRoX2NvbmZpZy5jc3YKLSAgICAgICAgLSBtb3VudFBhdGg6IC9vcHQvYXBwL2FhaS1yZXNvdXJjZXMvcmVzb3VyY2VzL2FhZi9vcmcub25hcC5hYWkucHJvcHMKLSAgICAgICAgICBuYW1lOiB7eyBpbmNsdWRlICJjb21tb24uZnVsbG5hbWUiIC4gfX0tYWFmLXByb3BlcnRpZXMKLSAgICAgICAgICBzdWJQYXRoOiBvcmcub25hcC5hYWkucHJvcHMKLSAgICAgICAgLSBtb3VudFBhdGg6IC9vcHQvYXBwL2FhaS1yZXNvdXJjZXMvcmVzb3VyY2VzL2FhZi9vcmcub3NhYWYubG9jYXRpb24ucHJvcHMKLSAgICAgICAgICBuYW1lOiB7eyBpbmNsdWRlICJjb21tb24uZnVsbG5hbWUiIC4gfX0tYWFmLXByb3BlcnRpZXMKLSAgICAgICAgICBzdWJQYXRoOiBvcmcub3NhYWYubG9jYXRpb24ucHJvcHMKLSAgICAgICAgLSBtb3VudFBhdGg6IC9vcHQvYXBwL2FhaS1yZXNvdXJjZXMvcmVzb3VyY2VzL2FhZi9wZXJtaXNzaW9ucy5wcm9wZXJ0aWVzCi0gICAgICAgICAgbmFtZToge3sgaW5jbHVkZSAiY29tbW9uLmZ1bGxuYW1lIiAuIH19LWFhZi1wcm9wZXJ0aWVzCi0gICAgICAgICAgc3ViUGF0aDogcGVybWlzc2lvbnMucHJvcGVydGllcwotICAgICAgICAtIG1vdW50UGF0aDogL29wdC9hcHAvYWFpLXJlc291cmNlcy9yZXNvdXJjZXMvY2FkaS5wcm9wZXJ0aWVzCi0gICAgICAgICAgbmFtZToge3sgaW5jbHVkZSAiY29tbW9uLmZ1bGxuYW1lIiAuIH19LWFhZi1wcm9wZXJ0aWVzCi0gICAgICAgICAgc3ViUGF0aDogY2FkaS5wcm9wZXJ0aWVzCiAgICAgICAgIC0gbW91bnRQYXRoOiAvb3B0L2FwcC9hYWktcmVzb3VyY2VzL3Jlc291cmNlcy9hcHBsaWNhdGlvbi5wcm9wZXJ0aWVzCiAgICAgICAgICAgbmFtZToge3sgaW5jbHVkZSAiY29tbW9uLmZ1bGxuYW1lIiAuIH19LWNvbmZpZwogICAgICAgICAgIHN1YlBhdGg6IGFwcGxpY2F0aW9uLnByb3BlcnRpZXMKQEAgLTIwNiw3ICsxODYsNyBAQAogICAgICAgICAgIGh0dHBHZXQ6CiAgICAgICAgICAgICBwYXRoOiAvYWFpL3V0aWwvZWNobz9hY3Rpb249Y2hlY2tEQgogICAgICAgICAgICAgcG9ydDoge3sgLlZhbHVlcy5zZXJ2aWNlLmludGVybmFsUG9ydCB9fQotICAgICAgICAgICAgc2NoZW1lOiBIVFRQe3sgKGVxICJ0cnVlIiAoaW5jbHVkZSAiY29tbW9uLm5lZWRUTFMiIC4pKSB8IHRlcm5hcnkgIlMiICIiIH19CisgICAgICAgICAgICBzY2hlbWU6IEhUVFAKICAgICAgICAgICAgIGh0dHBIZWFkZXJzOgogICAgICAgICAgICAgLSBuYW1lOiBYLUZyb21BcHBJZAogICAgICAgICAgICAgICB2YWx1ZTogTGl2ZW5lc3NDaGVjawpAQCAtMjIxLDcgKzIwMSw3IEBACiAgICAgICAgICAgaHR0cEdldDoKICAgICAgICAgICAgIHBhdGg6IC9hYWkvdXRpbC9lY2hvP2FjdGlvbj1jaGVja0RCCiAgICAgICAgICAgICBwb3J0OiB7eyAuVmFsdWVzLnNlcnZpY2UuaW50ZXJuYWxQb3J0IH19Ci0gICAgICAgICAgICBzY2hlbWU6IEhUVFB7eyAoZXEgInRydWUiIChpbmNsdWRlICJjb21tb24ubmVlZFRMUyIgLikpIHwgdGVybmFyeSAiUyIgIiIgfX0KKyAgICAgICAgICAgIHNjaGVtZTogSFRUUAogICAgICAgICAgICAgaHR0cEhlYWRlcnM6CiAgICAgICAgICAgICAtIG5hbWU6IFgtRnJvbUFwcElkCiAgICAgICAgICAgICAgIHZhbHVlOiBSZWFkaW5lc3NDaGVjawpAQCAtMjQxLDcgKzIyMSw3IEBACiAgICAgICAjIHNpZGUgY2FyIGNvbnRhaW5lcnMKICAgICAgIHt7IGluY2x1ZGUgImNvbW1vbi5sb2cuc2lkZWNhciIgLiB8IG5pbmRlbnQgNiB9fQogICAgICAgc2VydmljZUFjY291bnROYW1lOiB7eyBpbmNsdWRlICJjb21tb24uZnVsbG5hbWUiIChkaWN0ICJzdWZmaXgiICJyZWFkIiAiZG90IiAuICl9fQotICAgICAgdm9sdW1lczoge3sgaW5jbHVkZSAiY29tbW9uLmNlcnRJbml0aWFsaXplci52b2x1bWVzIiAuIHwgbmluZGVudCA2IH19CisgICAgICB2b2x1bWVzOgogICAgICAgLSBuYW1lOiBsb2NhbHRpbWUKICAgICAgICAgaG9zdFBhdGg6CiAgICAgICAgICAgcGF0aDogL2V0Yy9sb2NhbHRpbWUKQEAgLTI1MSwxMiArMjMxLDYgQEAKICAgICAgIC0gbmFtZToge3sgaW5jbHVkZSAiY29tbW9uLmZ1bGxuYW1lIiAuIH19LWNvbmZpZwogICAgICAgICBjb25maWdNYXA6CiAgICAgICAgICAgbmFtZToge3sgaW5jbHVkZSAiY29tbW9uLmZ1bGxuYW1lIiAuIH19Ci0gICAgICAtIG5hbWU6IHt7IGluY2x1ZGUgImNvbW1vbi5mdWxsbmFtZSIgLiB9fS1hYWYtcHJvcGVydGllcwotICAgICAgICBjb25maWdNYXA6Ci0gICAgICAgICAgbmFtZToge3sgaW5jbHVkZSAiY29tbW9uLmZ1bGxuYW1lIiAuIH19LWFhZi1wcm9wcwotICAgICAgLSBuYW1lOiB7eyBpbmNsdWRlICJjb21tb24uZnVsbG5hbWUiIC4gfX0tYWFmLWNlcnRzCi0gICAgICAgIHNlY3JldDoKLSAgICAgICAgICBzZWNyZXROYW1lOiB7eyBpbmNsdWRlICJjb21tb24uZnVsbG5hbWUiIC4gfX0tYWFmLWtleXMKICAgICAgIHJlc3RhcnRQb2xpY3k6IHt7IC5WYWx1ZXMucmVzdGFydFBvbGljeSB9fQogICAgICAgaW1hZ2VQdWxsU2VjcmV0czoKICAgICAgIC0gbmFtZTogInt7IGluY2x1ZGUgImNvbW1vbi5uYW1lc3BhY2UiIC4gfX0tZG9ja2VyLXJlZ2lzdHJ5LWtleSIKZGlmZiAtLWdpdCBhL2t1YmVybmV0ZXMvYWFpL2NvbXBvbmVudHMvYWFpLXJlc291cmNlcy90ZW1wbGF0ZXMvc2VjcmV0LnlhbWwgYi9rdWJlcm5ldGVzL2FhaS9jb21wb25lbnRzL2FhaS1yZXNvdXJjZXMvdGVtcGxhdGVzL3NlY3JldC55YW1sCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBhMGQ4NjI5Li4wMDAwMDAwCi0tLSBhL2t1YmVybmV0ZXMvYWFpL2NvbXBvbmVudHMvYWFpLXJlc291cmNlcy90ZW1wbGF0ZXMvc2VjcmV0LnlhbWwKKysrIC9kZXYvbnVsbApAQCAtMSwzMSArMCwwIEBACi17ey8qCi0jIENvcHlyaWdodCDCqSAyMDIxIE9yYW5nZQotIwotIyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLSMgeW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotIyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLSMKLSMgICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0jCi0jIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLSMgZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLSMgV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0jIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLSMgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0qL319Ci0KLWFwaVZlcnNpb246IHYxCi1raW5kOiBTZWNyZXQKLW1ldGFkYXRhOgotICBuYW1lOiB7eyBpbmNsdWRlICJjb21tb24uZnVsbG5hbWUiIC4gfX0tYWFmLWtleXMKLSAgbmFtZXNwYWNlOiB7eyBpbmNsdWRlICJjb21tb24ubmFtZXNwYWNlIiAuIH19Ci0gIGxhYmVsczoKLSAgICBhcHA6IHt7IGluY2x1ZGUgImNvbW1vbi5uYW1lIiAuIH19Ci0gICAgY2hhcnQ6IHt7IC5DaGFydC5OYW1lIH19LXt7IC5DaGFydC5WZXJzaW9uIHwgcmVwbGFjZSAiKyIgIl8iIH19Ci0gICAgcmVsZWFzZToge3sgaW5jbHVkZSAiY29tbW9uLnJlbGVhc2UiIC4gfX0KLSAgICBoZXJpdGFnZToge3sgLlJlbGVhc2UuU2VydmljZSB9fQotdHlwZTogT3BhcXVlCi1kYXRhOgote3sgdHBsICguRmlsZXMuR2xvYiAicmVzb3VyY2VzL2NvbmZpZy9hYWYvYmF0aF9jb25maWcuY3N2IikuQXNTZWNyZXRzIC4gfCBpbmRlbnQgMiB9fQotLS0tCi17eyBpbmNsdWRlICJjb21tb24uc2VjcmV0RmFzdCIgLiB9fQpkaWZmIC0tZ2l0IGEva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL3ZhbHVlcy55YW1sIGIva3ViZXJuZXRlcy9hYWkvY29tcG9uZW50cy9hYWktcmVzb3VyY2VzL3ZhbHVlcy55YW1sCmluZGV4IGRlN2JmMmQuLmViMDZjOGYgMTAwNjQ0Ci0tLSBhL2t1YmVybmV0ZXMvYWFpL2NvbXBvbmVudHMvYWFpLXJlc291cmNlcy92YWx1ZXMueWFtbAorKysgYi9rdWJlcm5ldGVzL2FhaS9jb21wb25lbnRzL2FhaS1yZXNvdXJjZXMvdmFsdWVzLnlhbWwKQEAgLTEsNiArMSw3IEBACiAjIENvcHlyaWdodCAoYykgMjAxOCBBbWRvY3MsIEJlbGwgQ2FuYWRhLCBBVCZUCiAjIENvcHlyaWdodCAoYykgMjAyMCBOb2tpYSwgT3JhbmdlCiAjIE1vZGlmaWNhdGlvbnMgQ29weXJpZ2h0IChjKSAyMDIxIE9yYW5nZQorIyBNb2RpZmljYXRpb25zIENvcHlyaWdodCDCqSAyMDIzIE5vcmRpeCBGb3VuZGF0aW9uCiAjCiAjIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwogIyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCkBAIC01MSw4ICs1Miw3IEBACiAKICAgICAjIEFjdGl2ZSBzcHJpbmcgcHJvZmlsZXMgZm9yIHRoZSByZXNvdXJjZXMgbWljcm9zZXJ2aWNlCiAgICAgcHJvZmlsZXM6Ci0gICAgICAjIGFhZi1hdXRoIHByb2ZpbGUgd2lsbCBiZSBhdXRvbWF0aWNhbGx5IHNldCBpZiBhYWYgZW5hYmxlZCBpcyBzZXQgdG8gdHJ1ZQotICAgICAgYWN0aXZlOiBwcm9kdWN0aW9uLGRtYWFwICMsYWFmLWF1dGgKKyAgICAgIGFjdGl2ZTogcHJvZHVjdGlvbixkbWFhcAogCiAgICAgIyBOb3RpZmljYXRpb24gZXZlbnQgc3BlY2lmaWMgcHJvcGVydGllcwogICAgIG5vdGlmaWNhdGlvbjoKQEAgLTYzLDcgKzYzLDcgQEAKICAgICBzY2hlbWE6CiAgICAgICAjIFNwZWNpZmllcyBpZiB0aGUgY29ubmVjdGlvbiBzaG91bGQgYmUgb25lIHdheSBzc2wsIHR3byB3YXkgc3NsIG9yIG5vIGF1dGgKICAgICAgIHNlcnZpY2U6Ci0gICAgICAgIGNsaWVudDogb25lLXdheS1zc2wKKyAgICAgICAgY2xpZW50OiBuby1hdXRoCiAgICAgICAjIFNwZWNpZmllcyB3aGljaCB0cmFuc2xhdG9yIHRvIHVzZSBpZiBpdCBoYXMgc2NoZW1hLXNlcnZpY2UsIHRoZW4gaXQgd2lsbCBtYWtlIGEgcmVzdCByZXF1ZXN0IHRvIHNjaGVtYSBzZXJ2aWNlCiAgICAgICB0cmFuc2xhdG9yOgogICAgICAgICBsaXN0OiBzY2hlbWEtc2VydmljZQpAQCAtMTIzLDM4ICsxMjMsNiBAQAogICAgIHVybDogbmV0d29yawogICAtIG5hbWU6IGFhaS1leHRlcm5hbFN5c3RlbQogICAgIHVybDogZXh0ZXJuYWwtc3lzdGVtCi0jIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotIyBDZXJ0aWZpY2F0ZSBjb25maWd1cmF0aW9uCi0jIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotY2VydEluaXRpYWxpemVyOgotICBuYW1lT3ZlcnJpZGU6IGFhaS1yZXNvdXJjZXMtY2VydC1pbml0aWFsaXplcgotICBhYWZEZXBsb3lGcWk6IGRlcGxveWVyQHBlb3BsZS5vc2FhZi5vcmcKLSAgYWFmRGVwbG95UGFzczogZGVtbzEyMzQ1NiEKLSAgIyBhYWZEZXBsb3lDcmVkc0V4dGVybmFsU2VjcmV0OiBzb21lIHNlY3JldAotICBmcWRuOiBhYWktcmVzb3VyY2VzCi0gIGZxaTogYWFpLXJlc291cmNlc0BhYWktcmVzb3VyY2VzLm9uYXAub3JnCi0gIHB1YmxpY19mcWRuOiBhYWktcmVzb3VyY2VzLm9uYXAub3JnCi0gIGNhZGlfbG9uZ2l0dWRlOiAiMC4wIgotICBjYWRpX2xhdGl0dWRlOiAiMC4wIgotICBhcHBfbnM6IG9yZy5vc2FhZi5hYWYKLSAgY3JlZHNQYXRoOiAvb3B0L2FwcC9vc2FhZi9sb2NhbAotICBmcWlfbmFtZXNwYWNlOiBvcmcub25hcC5hYWktcmVzb3VyY2VzCi0gIGFhZl9hZGRfY29uZmlnOiB8Ci0gICAgZWNobyAiKioqIGNoYW5naW5nIHRoZW0gaW50byBzaGVsbCBzYWZlIG9uZXMiCi0gICAgZXhwb3J0IEtFWVNUT1JFX1BBU1NXT1JEPSQodHIgLWNkICdbOmFsbnVtOl0nIDwgL2Rldi91cmFuZG9tIHwgZm9sZCAtdzY0IHwgaGVhZCAtbjEpCi0gICAgZXhwb3J0IFRSVVNUU1RPUkVfUEFTU1dPUkQ9JCh0ciAtY2QgJ1s6YWxudW06XScgPCAvZGV2L3VyYW5kb20gfCBmb2xkIC13NjQgfCBoZWFkIC1uMSkKLSAgICBjZCB7eyAuVmFsdWVzLmNyZWRzUGF0aCB9fQotICAgIGtleXRvb2wgLXN0b3JlcGFzc3dkIC1uZXcgIiR7S0VZU1RPUkVfUEFTU1dPUkR9IiBcCi0gICAgICAtc3RvcmVwYXNzICIke2NhZGlfa2V5c3RvcmVfcGFzc3dvcmRfcDEyfSIgXAotICAgICAgLWtleXN0b3JlIHt7IC5WYWx1ZXMuZnFpX25hbWVzcGFjZSB9fS5wMTIKLSAgICBrZXl0b29sIC1zdG9yZXBhc3N3ZCAtbmV3ICIke1RSVVNUU1RPUkVfUEFTU1dPUkR9IiBcCi0gICAgICAtc3RvcmVwYXNzICIke2NhZGlfdHJ1c3RzdG9yZV9wYXNzd29yZH0iIFwKLSAgICAgIC1rZXlzdG9yZSB7eyAuVmFsdWVzLmZxaV9uYW1lc3BhY2UgfX0udHJ1c3QuamtzCi0gICAgZWNobyAiKioqIHNhdmUgdGhlIGdlbmVyYXRlZCBwYXNzd29yZHMiCi0gICAgZWNobyAiS0VZU1RPUkVfUEFTU1dPUkQ9JHtLRVlTVE9SRV9QQVNTV09SRH0iID4gbXljcmVkcy5wcm9wCi0gICAgZWNobyAiVFJVU1RTVE9SRV9QQVNTV09SRD0ke1RSVVNUU1RPUkVfUEFTU1dPUkR9IiA+PiBteWNyZWRzLnByb3AKLSAgICBlY2hvICIqKiogY2hhbmdlIG93bmVyc2hpcCBvZiBjZXJ0aWZpY2F0ZXMgdG8gdGFyZ2V0ZWQgdXNlciIKLSAgICBjaG93biAtUiAxMDAwIHt7IC5WYWx1ZXMuY3JlZHNQYXRoIH19CiAKICMgYXBwbGljYXRpb24gaW1hZ2UKIGltYWdlOiBvbmFwL2FhaS1yZXNvdXJjZXM6MS4xMS4wCg==