137825 2014-10-17 11:15:35 -0700 Web Inspector: Rename generated Inspector.json to CombinedDomains.json to prevent name collisions 2014-10-20 11:00:57 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned burg graouts joepeck timothy webkit-bug-importer oldest_to_newest 1042406 0 joepeck 2014-10-17 11:15:35 -0700 Rename generated Inspector.json to CombinedDomains.json. This will be nice so we can rename InspectorDomain.json to Inspector.json. 1042407 1 240024 joepeck 2014-10-17 11:16:40 -0700 Created attachment 240024 [PATCH] Proposed Fix Depends on Bug 137748. 1042885 2 joepeck 2014-10-20 11:00:49 -0700 http://trac.webkit.org/changeset/174893 240024 2014-10-17 11:16:40 -0700 2014-10-20 11:00:57 -0700 [PATCH] Proposed Fix rename.patch text/plain 13121 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DTWFrZUxpc3RzLnR4dCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DTWFrZUxpc3RzLnR4dAppbmRleCA5N2NkMDQ5Li43NDFjZDZhIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ01ha2VMaXN0cy50eHQKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL0NNYWtlTGlzdHMudHh0CkBAIC05NzEsNyArOTcxLDcgQEAgc2V0 KEphdmFTY3JpcHRDb3JlX0lOU1BFQ1RPUl9ET01BSU5TCiAgICAgJHtKQVZBU0NSSVBUQ09SRV9E SVJ9L2luc3BlY3Rvci9wcm90b2NvbC9ET01TdG9yYWdlLmpzb24KICAgICAke0pBVkFTQ1JJUFRD T1JFX0RJUn0vaW5zcGVjdG9yL3Byb3RvY29sL0RlYnVnZ2VyLmpzb24KICAgICAke0pBVkFTQ1JJ UFRDT1JFX0RJUn0vaW5zcGVjdG9yL3Byb3RvY29sL0dlbmVyaWNUeXBlcy5qc29uCi0gICAgJHtK QVZBU0NSSVBUQ09SRV9ESVJ9L2luc3BlY3Rvci9wcm90b2NvbC9JbnNwZWN0b3JEb21haW4uanNv bgorICAgICR7SkFWQVNDUklQVENPUkVfRElSfS9pbnNwZWN0b3IvcHJvdG9jb2wvSW5zcGVjdG9y Lmpzb24KICAgICAke0pBVkFTQ1JJUFRDT1JFX0RJUn0vaW5zcGVjdG9yL3Byb3RvY29sL0xheWVy VHJlZS5qc29uCiAgICAgJHtKQVZBU0NSSVBUQ09SRV9ESVJ9L2luc3BlY3Rvci9wcm90b2NvbC9O ZXR3b3JrLmpzb24KICAgICAke0pBVkFTQ1JJUFRDT1JFX0RJUn0vaW5zcGVjdG9yL3Byb3RvY29s L1BhZ2UuanNvbgpAQCAtOTk5LDEwICs5OTksMTAgQEAgaWYgKEVOQUJMRV9XRUJfUkVQTEFZKQog ZW5kaWYgKCkKIAogYWRkX2N1c3RvbV9jb21tYW5kKAotICAgIE9VVFBVVCAke0RFUklWRURfU09V UkNFU19KQVZBU0NSSVBUQ09SRV9ESVJ9L0luc3BlY3Rvci5qc29uCisgICAgT1VUUFVUICR7REVS SVZFRF9TT1VSQ0VTX0pBVkFTQ1JJUFRDT1JFX0RJUn0vQ29tYmluZWREb21haW5zLmpzb24KICAg ICBNQUlOX0RFUEVOREVOQ1kgJHtKYXZhU2NyaXB0Q29yZV9JTlNQRUNUT1JfU0NSSVBUU19ESVJ9 L2dlbmVyYXRlLWNvbWJpbmVkLWluc3BlY3Rvci1qc29uLnB5CiAgICAgREVQRU5EUyAke0phdmFT Y3JpcHRDb3JlX0lOU1BFQ1RPUl9ET01BSU5TfQotICAgIENPTU1BTkQgJHtQWVRIT05fRVhFQ1VU QUJMRX0gJHtKYXZhU2NyaXB0Q29yZV9JTlNQRUNUT1JfU0NSSVBUU19ESVJ9L2dlbmVyYXRlLWNv bWJpbmVkLWluc3BlY3Rvci1qc29uLnB5ICR7SmF2YVNjcmlwdENvcmVfSU5TUEVDVE9SX0RPTUFJ TlN9ID4gJHtERVJJVkVEX1NPVVJDRVNfSkFWQVNDUklQVENPUkVfRElSfS9JbnNwZWN0b3IuanNv bgorICAgIENPTU1BTkQgJHtQWVRIT05fRVhFQ1VUQUJMRX0gJHtKYXZhU2NyaXB0Q29yZV9JTlNQ RUNUT1JfU0NSSVBUU19ESVJ9L2dlbmVyYXRlLWNvbWJpbmVkLWluc3BlY3Rvci1qc29uLnB5ICR7 SmF2YVNjcmlwdENvcmVfSU5TUEVDVE9SX0RPTUFJTlN9ID4gJHtERVJJVkVEX1NPVVJDRVNfSkFW QVNDUklQVENPUkVfRElSfS9Db21iaW5lZERvbWFpbnMuanNvbgogICAgIFZFUkJBVElNKQogCiAj IEluc3BlY3RvciBCYWNrZW5kIERpc3BhdGNoZXJzLCBGcm9udGVuZCBEaXNwYXRjaGVycywgVHlw ZSBCdWlsZGVycwpAQCAtMTAxNCw5ICsxMDE0LDkgQEAgYWRkX2N1c3RvbV9jb21tYW5kKAogICAg ICAgICAgICAke0RFUklWRURfU09VUkNFU19KQVZBU0NSSVBUQ09SRV9ESVJ9L2luc3BlY3Rvci9J bnNwZWN0b3JQcm90b2NvbE9iamVjdHMuY3BwCiAgICAgICAgICAgICR7REVSSVZFRF9TT1VSQ0VT X0pBVkFTQ1JJUFRDT1JFX0RJUn0vaW5zcGVjdG9yL0luc3BlY3RvclByb3RvY29sT2JqZWN0cy5o CiAgICAgICAgICAgICR7REVSSVZFRF9TT1VSQ0VTX1dFQklOU1BFQ1RPUlVJX0RJUn0vVXNlcklu dGVyZmFjZS9Qcm90b2NvbC9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMKLSAgICBNQUlOX0RF UEVOREVOQ1kgJHtERVJJVkVEX1NPVVJDRVNfSkFWQVNDUklQVENPUkVfRElSfS9JbnNwZWN0b3Iu anNvbgorICAgIE1BSU5fREVQRU5ERU5DWSAke0RFUklWRURfU09VUkNFU19KQVZBU0NSSVBUQ09S RV9ESVJ9L0NvbWJpbmVkRG9tYWlucy5qc29uCiAgICAgREVQRU5EUyAke0phdmFTY3JpcHRDb3Jl X0lOU1BFQ1RPUl9QUk9UT0NPTF9TQ1JJUFRTfQotICAgIENPTU1BTkQgJHtQWVRIT05fRVhFQ1VU QUJMRX0gJHtKYXZhU2NyaXB0Q29yZV9JTlNQRUNUT1JfU0NSSVBUU19ESVJ9L2dlbmVyYXRlLWlu c3BlY3Rvci1wcm90b2NvbC1iaW5kaW5ncy5weSAtLW91dHB1dERpciAiJHtERVJJVkVEX1NPVVJD RVNfSkFWQVNDUklQVENPUkVfRElSfSIgLS1mcmFtZXdvcmsgSmF2YVNjcmlwdENvcmUgJHtERVJJ VkVEX1NPVVJDRVNfSkFWQVNDUklQVENPUkVfRElSfS9JbnNwZWN0b3IuanNvbiAmJiBta2RpciAt cCAke0RFUklWRURfU09VUkNFU19KQVZBU0NSSVBUQ09SRV9ESVJ9L2luc3BlY3RvciAmJiBjcCAk e0RFUklWRURfU09VUkNFU19KQVZBU0NSSVBUQ09SRV9ESVJ9L0luc3BlY3RvckJhY2tlbmREaXNw YXRjaGVycy5oICR7REVSSVZFRF9TT1VSQ0VTX0pBVkFTQ1JJUFRDT1JFX0RJUn0vSW5zcGVjdG9y QmFja2VuZERpc3BhdGNoZXJzLmNwcCAke0RFUklWRURfU09VUkNFU19KQVZBU0NSSVBUQ09SRV9E SVJ9L0luc3BlY3RvckZyb250ZW5kRGlzcGF0Y2hlcnMuaCAke0RFUklWRURfU09VUkNFU19KQVZB U0NSSVBUQ09SRV9ESVJ9L0luc3BlY3RvckZyb250ZW5kRGlzcGF0Y2hlcnMuY3BwICR7REVSSVZF RF9TT1VSQ0VTX0pBVkFTQ1JJUFRDT1JFX0RJUn0vSW5zcGVjdG9yUHJvdG9jb2xPYmplY3RzLmgg JHtERVJJVkVEX1NPVVJDRVNfSkFWQVNDUklQVENPUkVfRElSfS9JbnNwZWN0b3JQcm90b2NvbE9i amVjdHMuY3BwICR7REVSSVZFRF9TT1VSQ0VTX0pBVkFTQ1JJUFRDT1JFX0RJUn0vaW5zcGVjdG9y ICYmIG1rZGlyIC1wICR7REVSSVZFRF9TT1VSQ0VTX1dFQklOU1BFQ1RPUlVJX0RJUn0vVXNlcklu dGVyZmFjZS9Qcm90b2NvbCAmJiBjcCAke0RFUklWRURfU09VUkNFU19KQVZBU0NSSVBUQ09SRV9E SVJ9L0luc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcyAke0RFUklWRURfU09VUkNFU19XRUJJTlNQ RUNUT1JVSV9ESVJ9L1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wKKyAgICBDT01NQU5EICR7UFlUSE9O X0VYRUNVVEFCTEV9ICR7SmF2YVNjcmlwdENvcmVfSU5TUEVDVE9SX1NDUklQVFNfRElSfS9nZW5l cmF0ZS1pbnNwZWN0b3ItcHJvdG9jb2wtYmluZGluZ3MucHkgLS1vdXRwdXREaXIgIiR7REVSSVZF RF9TT1VSQ0VTX0pBVkFTQ1JJUFRDT1JFX0RJUn0iIC0tZnJhbWV3b3JrIEphdmFTY3JpcHRDb3Jl ICR7REVSSVZFRF9TT1VSQ0VTX0pBVkFTQ1JJUFRDT1JFX0RJUn0vQ29tYmluZWREb21haW5zLmpz b24gJiYgbWtkaXIgLXAgJHtERVJJVkVEX1NPVVJDRVNfSkFWQVNDUklQVENPUkVfRElSfS9pbnNw ZWN0b3IgJiYgY3AgJHtERVJJVkVEX1NPVVJDRVNfSkFWQVNDUklQVENPUkVfRElSfS9JbnNwZWN0 b3JCYWNrZW5kRGlzcGF0Y2hlcnMuaCAke0RFUklWRURfU09VUkNFU19KQVZBU0NSSVBUQ09SRV9E SVJ9L0luc3BlY3RvckJhY2tlbmREaXNwYXRjaGVycy5jcHAgJHtERVJJVkVEX1NPVVJDRVNfSkFW QVNDUklQVENPUkVfRElSfS9JbnNwZWN0b3JGcm9udGVuZERpc3BhdGNoZXJzLmggJHtERVJJVkVE X1NPVVJDRVNfSkFWQVNDUklQVENPUkVfRElSfS9JbnNwZWN0b3JGcm9udGVuZERpc3BhdGNoZXJz LmNwcCAke0RFUklWRURfU09VUkNFU19KQVZBU0NSSVBUQ09SRV9ESVJ9L0luc3BlY3RvclByb3Rv Y29sT2JqZWN0cy5oICR7REVSSVZFRF9TT1VSQ0VTX0pBVkFTQ1JJUFRDT1JFX0RJUn0vSW5zcGVj dG9yUHJvdG9jb2xPYmplY3RzLmNwcCAke0RFUklWRURfU09VUkNFU19KQVZBU0NSSVBUQ09SRV9E SVJ9L2luc3BlY3RvciAmJiBta2RpciAtcCAke0RFUklWRURfU09VUkNFU19XRUJJTlNQRUNUT1JV SV9ESVJ9L1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wgJiYgY3AgJHtERVJJVkVEX1NPVVJDRVNfSkFW QVNDUklQVENPUkVfRElSfS9JbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMgJHtERVJJVkVEX1NP VVJDRVNfV0VCSU5TUEVDVE9SVUlfRElSfS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sCiAgICAgVkVS QkFUSU0pCiBmaWxlKE1BS0VfRElSRUNUT1JZICR7REVSSVZFRF9TT1VSQ0VTX0pBVkFTQ1JJUFRD T1JFX0RJUn0vaW5zcGVjdG9yKQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv Q2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1NjY3MDYw Li42MTRiNDQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAx NC0xMC0xNyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAgICAg IFdlYiBJbnNwZWN0b3I6IFJlbmFtZSBnZW5lcmF0ZWQgSW5zcGVjdG9yLmpzb24gdG8gQ29tYmlu ZWREb21haW5zLmpzb24gdG8gcHJldmVudCBuYW1lIGNvbGxpc2lvbnMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzgyNQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6CisgICAg ICAgICogRGVyaXZlZFNvdXJjZXMubWFrZToKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS52Y3hw cm9qL2NvcHktZmlsZXMuY21kOgorICAgICAgICAqIEphdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2o6CisgICAgICAgICogaW5zcGVjdG9yL3Byb3RvY29sL0luc3BlY3Rvci5q c29uOiBSZW5hbWVkIGZyb20gU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2Nv bC9JbnNwZWN0b3JEb21haW4uanNvbi4KKwogMjAxNC0xMC0xNSAgSm9zZXBoIFBlY29yYXJvICA8 cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEdlbmVyYXRlIGFs bCBJbnNwZWN0b3IgZG9tYWlucyB0b2dldGhlciBpbiBKYXZhU2NyaXB0Q29yZQpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0Rlcml2ZWRTb3VyY2VzLm1ha2UgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvRGVyaXZlZFNvdXJjZXMubWFrZQppbmRleCBmOWZkNzRiLi5mYTFjMjBlIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvRGVyaXZlZFNvdXJjZXMubWFrZQorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvRGVyaXZlZFNvdXJjZXMubWFrZQpAQCAtMTIxLDcgKzEy MSw3IEBAIElOU1BFQ1RPUl9ET01BSU5TID0gXAogICAgICQoSmF2YVNjcmlwdENvcmUpL2luc3Bl Y3Rvci9wcm90b2NvbC9ET01TdG9yYWdlLmpzb24gXAogICAgICQoSmF2YVNjcmlwdENvcmUpL2lu c3BlY3Rvci9wcm90b2NvbC9EZWJ1Z2dlci5qc29uIFwKICAgICAkKEphdmFTY3JpcHRDb3JlKS9p bnNwZWN0b3IvcHJvdG9jb2wvR2VuZXJpY1R5cGVzLmpzb24gXAotICAgICQoSmF2YVNjcmlwdENv cmUpL2luc3BlY3Rvci9wcm90b2NvbC9JbnNwZWN0b3JEb21haW4uanNvbiBcCisgICAgJChKYXZh U2NyaXB0Q29yZSkvaW5zcGVjdG9yL3Byb3RvY29sL0luc3BlY3Rvci5qc29uIFwKICAgICAkKEph dmFTY3JpcHRDb3JlKS9pbnNwZWN0b3IvcHJvdG9jb2wvTGF5ZXJUcmVlLmpzb24gXAogICAgICQo SmF2YVNjcmlwdENvcmUpL2luc3BlY3Rvci9wcm90b2NvbC9OZXR3b3JrLmpzb24gXAogICAgICQo SmF2YVNjcmlwdENvcmUpL2luc3BlY3Rvci9wcm90b2NvbC9QYWdlLmpzb24gXApAQCAtMTU5LDcg KzE1OSw3IEBAIElOU1BFQ1RPUl9HRU5FUkFUT1JfU0NSSVBUUyA9IFwKICMKIAogYWxsIDogXAot ICAgIEluc3BlY3Rvci5qc29uIFwKKyAgICBDb21iaW5lZERvbWFpbnMuanNvbiBcCiAgICAgSW5z cGVjdG9yRnJvbnRlbmREaXNwYXRjaGVycy5oIFwKICAgICBJbmplY3RlZFNjcmlwdFNvdXJjZS5o IFwKICMKQEAgLTE3MSwxMiArMTcxLDEyIEBAIGFsbCA6IFwKIEVuYWJsZWRJbnNwZWN0b3JEb21h aW5zIDogZm9yY2UKIAllY2hvICckKElOU1BFQ1RPUl9ET01BSU5TKScgfCBjbXAgLXMgLSAkQCB8 fCBlY2hvICckKElOU1BFQ1RPUl9ET01BSU5TKScgPiAkQAogCi1JbnNwZWN0b3IuanNvbiA6IGlu c3BlY3Rvci9zY3JpcHRzL2dlbmVyYXRlLWNvbWJpbmVkLWluc3BlY3Rvci1qc29uLnB5ICQoSU5T UEVDVE9SX0RPTUFJTlMpIEVuYWJsZWRJbnNwZWN0b3JEb21haW5zCi0JJChQWVRIT04pICQoSmF2 YVNjcmlwdENvcmUpL2luc3BlY3Rvci9zY3JpcHRzL2dlbmVyYXRlLWNvbWJpbmVkLWluc3BlY3Rv ci1qc29uLnB5ICQoSU5TUEVDVE9SX0RPTUFJTlMpID4gLi9JbnNwZWN0b3IuanNvbgorQ29tYmlu ZWREb21haW5zLmpzb24gOiBpbnNwZWN0b3Ivc2NyaXB0cy9nZW5lcmF0ZS1jb21iaW5lZC1pbnNw ZWN0b3ItanNvbi5weSAkKElOU1BFQ1RPUl9ET01BSU5TKSBFbmFibGVkSW5zcGVjdG9yRG9tYWlu cworCSQoUFlUSE9OKSAkKEphdmFTY3JpcHRDb3JlKS9pbnNwZWN0b3Ivc2NyaXB0cy9nZW5lcmF0 ZS1jb21iaW5lZC1pbnNwZWN0b3ItanNvbi5weSAkKElOU1BFQ1RPUl9ET01BSU5TKSA+IC4vQ29t YmluZWREb21haW5zLmpzb24KIAogIyBJbnNwZWN0b3IgQmFja2VuZCBEaXNwYXRjaGVycywgRnJv bnRlbmQgRGlzcGF0Y2hlcnMsIFR5cGUgQnVpbGRlcnMKLUluc3BlY3RvckZyb250ZW5kRGlzcGF0 Y2hlcnMuaCA6IEluc3BlY3Rvci5qc29uICQoSU5TUEVDVE9SX0dFTkVSQVRPUl9TQ1JJUFRTKQot CSQoUFlUSE9OKSAkKEphdmFTY3JpcHRDb3JlKS9pbnNwZWN0b3Ivc2NyaXB0cy9nZW5lcmF0ZS1p bnNwZWN0b3ItcHJvdG9jb2wtYmluZGluZ3MucHkgLS1mcmFtZXdvcmsgSmF2YVNjcmlwdENvcmUg LS1vdXRwdXREaXIgLiAuL0luc3BlY3Rvci5qc29uCitJbnNwZWN0b3JGcm9udGVuZERpc3BhdGNo ZXJzLmggOiBDb21iaW5lZERvbWFpbnMuanNvbiAkKElOU1BFQ1RPUl9HRU5FUkFUT1JfU0NSSVBU UykKKwkkKFBZVEhPTikgJChKYXZhU2NyaXB0Q29yZSkvaW5zcGVjdG9yL3NjcmlwdHMvZ2VuZXJh dGUtaW5zcGVjdG9yLXByb3RvY29sLWJpbmRpbmdzLnB5IC0tZnJhbWV3b3JrIEphdmFTY3JpcHRD b3JlIC0tb3V0cHV0RGlyIC4gLi9Db21iaW5lZERvbWFpbnMuanNvbgogCiBJbmplY3RlZFNjcmlw dFNvdXJjZS5oIDogaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzICQoSmF2YVNjcmlw dENvcmUpL2luc3BlY3Rvci9zY3JpcHRzL2pzbWluLnB5ICQoSmF2YVNjcmlwdENvcmUpL2luc3Bl Y3Rvci9zY3JpcHRzL3h4ZC5wbAogCWVjaG8gIi8vIyBzb3VyY2VVUkw9X19XZWJJbnNwZWN0b3JJ bmplY3RlZFNjcmlwdF9fIiA+IC4vSW5qZWN0ZWRTY3JpcHRTb3VyY2UubWluLmpzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUudmN4cHJvai9jb3B5LWZp bGVzLmNtZCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52Y3hwcm9qL2Nv cHktZmlsZXMuY21kCmluZGV4IGFlYzliMTYuLjQ2MTI5MDAgMTAwNzU1Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52Y3hwcm9qL2NvcHktZmlsZXMuY21kCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52Y3hwcm9qL2NvcHktZmlsZXMu Y21kCkBAIC03MCw3ICs3MCw3IEBAIGZvciAlJWQgaW4gKAogKQ0KIA0KIGVjaG8gQ29weWluZyBJ bnNwZWN0b3IgZ2VuZXJhdGVkIGZpbGVzIGFzIGlmIHRoZXkgd2VyZSBwcml2YXRlIGhlYWRlcnMu Li4NCi14Y29weSAveSAiJURlcml2ZWRTb3VyY2VzRGlyZWN0b3J5JVxJbnNwZWN0b3IuanNvbiIg IiVQcml2YXRlSGVhZGVyc0RpcmVjdG9yeSUiID5OVUwNCit4Y29weSAveSAiJURlcml2ZWRTb3Vy Y2VzRGlyZWN0b3J5JVxDb21iaW5lZERvbWFpbnMuanNvbiIgIiVQcml2YXRlSGVhZGVyc0RpcmVj dG9yeSUiID5OVUwNCiB4Y29weSAveSAiJURlcml2ZWRTb3VyY2VzRGlyZWN0b3J5JVxJbnNwZWN0 b3JQcm90b2NvbE9iamVjdHMuaCIgIiVQcml2YXRlSGVhZGVyc0RpcmVjdG9yeSUiID5OVUwNCiB4 Y29weSAveSAiJURlcml2ZWRTb3VyY2VzRGlyZWN0b3J5JVxJbnNwZWN0b3JCYWNrZW5kRGlzcGF0 Y2hlcnMuaCIgIiVQcml2YXRlSGVhZGVyc0RpcmVjdG9yeSUiID5OVUwNCiB4Y29weSAveSAiJURl cml2ZWRTb3VyY2VzRGlyZWN0b3J5JVxJbnNwZWN0b3JGcm9udGVuZERpc3BhdGNoZXJzLmgiICIl UHJpdmF0ZUhlYWRlcnNEaXJlY3RvcnklIiA+TlVMDQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agppbmRleCAxOGI2ZDE3Li5iZDliYTU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpA QCAtMTEyNSw3ICsxMTI1LDcgQEAKIAkJQTUzMjQzOEIxODU2ODMzNTAwMkVENjkyIC8qIEluc3Bl Y3RvclByb3RvY29sT2JqZWN0cy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSBBNTMyNDM4NTE4NTY4MzE3MDAyRUQ2OTIgLyogSW5zcGVjdG9yUHJvdG9j b2xPYmplY3RzLmNwcCAqLzsgfTsKIAkJQTUzMjQzOEMxODU2ODMzNTAwMkVENjkyIC8qIEluc3Bl Y3RvclByb3RvY29sT2JqZWN0cy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gQTUzMjQzODYxODU2ODMxNzAwMkVENjkyIC8qIEluc3BlY3RvclByb3RvY29s T2JqZWN0cy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07 CiAJCUE1MzI0Mzk0MTg1Njk3MDkwMDJFRDY5MiAvKiBnZW5lcmF0ZS1jb21iaW5lZC1pbnNwZWN0 b3ItanNvbi5weSBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IEE1MzI0MzkxMTg1Njk2RTYwMDJFRDY5MiAvKiBnZW5lcmF0ZS1jb21iaW5lZC1pbnNwZWN0b3It anNvbi5weSAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9Owot CQlBNTMyNDM5ODE4NTZBNDg5MDAyRUQ2OTIgLyogSW5zcGVjdG9yLmpzb24gaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBNTMyNDM5NTE4NTZBNDc1MDAyRUQ2 OTIgLyogSW5zcGVjdG9yLmpzb24gKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0 ZSwgKTsgfTsgfTsKKwkJQTUzMjQzOTgxODU2QTQ4OTAwMkVENjkyIC8qIENvbWJpbmVkRG9tYWlu cy5qc29uIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQTUz MjQzOTUxODU2QTQ3NTAwMkVENjkyIC8qIENvbWJpbmVkRG9tYWlucy5qc29uICovOyBzZXR0aW5n cyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUE1M0NFMDg1MThCQzFBNTYw MEJFREY3NiAvKiBDb25zb2xlUHJvdG90eXBlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE1M0NFMDgxMThCQzFBNTYwMEJFREY3NiAvKiBDb25zb2xl UHJvdG90eXBlLmNwcCAqLzsgfTsKIAkJQTUzQ0UwODYxOEJDMUE1NjAwQkVERjc2IC8qIENvbnNv bGVQcm90b3R5cGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IEE1M0NFMDgyMThCQzFBNTYwMEJFREY3NiAvKiBDb25zb2xlUHJvdG90eXBlLmggKi87IH07 CiAJCUE1M0NFMDg3MThCQzFBNTYwMEJFREY3NiAvKiBKU0NvbnNvbGUuY3BwIGluIFNvdXJjZXMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQTUzQ0UwODMxOEJDMUE1NjAwQkVE Rjc2IC8qIEpTQ29uc29sZS5jcHAgKi87IH07CkBAIC0yNzk3LDcgKzI3OTcsNyBAQAogCQlBNTMy NDM4NjE4NTY4MzE3MDAyRUQ2OTIgLyogSW5zcGVjdG9yUHJvdG9jb2xPYmplY3RzLmggKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu aDsgcGF0aCA9IEluc3BlY3RvclByb3RvY29sT2JqZWN0cy5oOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQlBNTMyNDM4RDE4NTY5NkNBMDAyRUQ2OTIgLyogcHJvdG9jb2wgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBmb2xkZXI7IHBhdGggPSBw cm90b2NvbDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQTUzMjQzOTExODU2OTZFNjAw MkVENjkyIC8qIGdlbmVyYXRlLWNvbWJpbmVkLWluc3BlY3Rvci1qc29uLnB5ICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g dGV4dC5zY3JpcHQucHl0aG9uOyBwYXRoID0gImdlbmVyYXRlLWNvbWJpbmVkLWluc3BlY3Rvci1q c29uLnB5Ijsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJQTUzMjQzOTUxODU2QTQ3NTAw MkVENjkyIC8qIEluc3BlY3Rvci5qc29uICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5qc29uOyBwYXRoID0gSW5z cGVjdG9yLmpzb247IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCUE1MzI0Mzk1MTg1NkE0 NzUwMDJFRDY5MiAvKiBDb21iaW5lZERvbWFpbnMuanNvbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuanNvbjsg cGF0aCA9IENvbWJpbmVkRG9tYWlucy5qc29uOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQlBNTMyNDM5NjE4NTZBNDc1MDAyRUQ2OTIgLyogSW5zcGVjdG9yQmFja2VuZENvbW1hbmRzLmpz ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5qYXZhc2NyaXB0OyBwYXRoID0gSW5zcGVjdG9yQmFja2Vu ZENvbW1hbmRzLmpzOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlBNTNDRTA4MTE4QkMx QTU2MDBCRURGNzYgLyogQ29uc29sZVByb3RvdHlwZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IHBhdGggPSBDb25zb2xlUHJvdG90eXBlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJQTUzQ0UwODIxOEJDMUE1NjAwQkVERjc2IC8qIENvbnNvbGVQcm90b3R5cGUu aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQ29uc29sZVByb3RvdHlwZS5oOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNDAwNywxMCArNDAwNywxMCBAQAogCQkJY2hp bGRyZW4gPSAoCiAJCQkJQkMxOEM1MjMwRTE2RkM4QTAwQjM0NDYwIC8qIEFycmF5UHJvdG90eXBl Lmx1dC5oICovLAogCQkJCTY1MTRGMjE3MThCM0UxNjcwMDk4RkY4QiAvKiBCeXRlY29kZXMuaCAq LywKKwkJCQlBNTMyNDM5NTE4NTZBNDc1MDAyRUQ2OTIgLyogQ29tYmluZWREb21haW5zLmpzb24g Ki8sCiAJCQkJQkNEMjAzRTcwRTE3MThGNDAwMkM3RTgyIC8qIERhdGVQcm90b3R5cGUubHV0Lmgg Ki8sCiAJCQkJNjUxNEYyMTgxOEIzRTE2NzAwOThGRjhCIC8qIEluaXRCeXRlY29kZXMuYXNtICov LAogCQkJCUE1MTNFNUM2MTg1Rjk0MzYwMDdFOTVBRCAvKiBJbmplY3RlZFNjcmlwdFNvdXJjZS5o ICovLAotCQkJCUE1MzI0Mzk1MTg1NkE0NzUwMDJFRDY5MiAvKiBJbnNwZWN0b3IuanNvbiAqLywK IAkJCQlBNTMyNDM5NjE4NTZBNDc1MDAyRUQ2OTIgLyogSW5zcGVjdG9yQmFja2VuZENvbW1hbmRz LmpzICovLAogCQkJCUE1MzI0MzgxMTg1NjgzMTcwMDJFRDY5MiAvKiBJbnNwZWN0b3JCYWNrZW5k RGlzcGF0Y2hlcnMuY3BwICovLAogCQkJCUE1MzI0MzgyMTg1NjgzMTcwMDJFRDY5MiAvKiBJbnNw ZWN0b3JCYWNrZW5kRGlzcGF0Y2hlcnMuaCAqLywKQEAgLTU3MDgsNyArNTcwOCw3IEBACiAJCQkJ QTU3RDIzRTYxODkwQ0VCRjAwMzFDN0ZBIC8qIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQuaCBpbiBI ZWFkZXJzICovLAogCQkJCUE1RDBBMUJCMTg2MjMwMUIwMEM3QjQ5NiAvKiBJbnNwZWN0b3JFbnZp cm9ubWVudC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQTU5NDU1OTUxODI0NzlFQjAwQ0MzODQzIC8q IEluc3BlY3RvckZyb250ZW5kQ2hhbm5lbC5oIGluIEhlYWRlcnMgKi8sCi0JCQkJQTUzMjQzOTgx ODU2QTQ4OTAwMkVENjkyIC8qIEluc3BlY3Rvci5qc29uIGluIEhlYWRlcnMgKi8sCisJCQkJQTUz MjQzOTgxODU2QTQ4OTAwMkVENjkyIC8qIENvbWJpbmVkRG9tYWlucy5qc29uIGluIEhlYWRlcnMg Ki8sCiAJCQkJQTUzMjQzODgxODU2ODMzNTAwMkVENjkyIC8qIEluc3BlY3RvckJhY2tlbmREaXNw YXRjaGVycy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQTUzMjQzOEExODU2ODMzNTAwMkVENjkyIC8q IEluc3BlY3RvckZyb250ZW5kRGlzcGF0Y2hlcnMuaCBpbiBIZWFkZXJzICovLAogCQkJCTg2MDZE REVBMThEQTQ0QUIwMEEzODNEMCAvKiBJZGVudGlmaWVySW5saW5lcy5oIGluIEhlYWRlcnMgKi8s CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL0lu c3BlY3RvckRvbWFpbi5qc29uIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90 b2NvbC9JbnNwZWN0b3IuanNvbgpzaW1pbGFyaXR5IGluZGV4IDEwMCUKcmVuYW1lIGZyb20gU291 cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9JbnNwZWN0b3JEb21haW4uanNv bgpyZW5hbWUgdG8gU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9JbnNw ZWN0b3IuanNvbgo=