168816 2017-02-23 19:16:26 -0800 Rename 'commit_parent' in 'commits' table to 'commit_previous_commit'. 2017-02-23 23:23:13 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dewei_zhu webkit-unassigned cdumez commit-queue dewei_zhu rniwa oldest_to_newest 1280627 0 dewei_zhu 2017-02-23 19:16:26 -0800 Rename 'commit_parent' in 'commits' table to 'commit_previous_commit'. 1280630 1 302630 dewei_zhu 2017-02-23 19:21:20 -0800 Created attachment 302630 Patch 1280631 2 cdumez 2017-02-23 19:25:00 -0800 commit_previous_commit ? What does it mean? 1280633 3 302630 rniwa 2017-02-23 19:45:16 -0800 Comment on attachment 302630 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=302630&action=review r=me with previous_commit > previousCommit in JSON API. > Websites/perf.webkit.org/public/include/commit-log-fetcher.php:124 > - 'parent' => $commit_row['commit_parent'], > + 'previous_commit' => $commit_row['commit_previous_commit'], We should be using camelCase for JSON API. > Websites/perf.webkit.org/tools/sync-commits.py:234 > - 'parent': parent_hash, > + 'previous_commit': previous_hash, This should also be previousCommit. 1280634 4 rniwa 2017-02-23 19:47:26 -0800 (In reply to comment #2) > commit_previous_commit ? What does it mean? In subversion, the previous commit of a revision X is X - 1. In git, the previous commit of a commit X is the parent commit. Because we're introducing the concept of a repository having a parent/owner repository, we're changing this column to be more semantically clear as to what it means. We can also call it preceding commit but that doesn't make much sense in Git world. 1280679 5 302644 dewei_zhu 2017-02-23 22:39:51 -0800 Created attachment 302644 Patch for landing 1280702 6 302644 commit-queue 2017-02-23 23:19:36 -0800 Comment on attachment 302644 Patch for landing Clearing flags on attachment: 302644 Committed r212947: <http://trac.webkit.org/changeset/212947> 1280703 7 commit-queue 2017-02-23 23:19:40 -0800 All reviewed patches have been landed. Closing bug. 1280704 8 rniwa 2017-02-23 23:23:13 -0800 Confirmed this works on a local copy of the production database on my machine. 302630 2017-02-23 19:21:20 -0800 2017-02-23 22:39:46 -0800 Patch bug-168816-20170223191831.patch text/plain 13810 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyOTMzCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBkMjE0MGFhMzQxM2UyMmU5MDFhOWRlZjViNmYxZDE2NzMyZDc0ZTRiLi43YTgwZDZhYzM0 MWVmYmFkZWIzNGJjMGJmZDY3NzkwNDBkZmNkM2E2IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxNy0wMi0yMyAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgJ2NvbW1pdF9wYXJlbnQnIGluICdjb21taXRz JyB0YWJsZSB0byAnY29tbWl0X3ByZXZpb3VzX2NvbW1pdCcuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjg4MTYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgJ2NvbW1pdF9wYXJlbnQnIHRvIGF2 b2lkIGFtYmlndWl0eSBpbiB0aGUgY29taW5nIGZlYXR1cmUuCisgICAgICAgIEZvciBleGlzaXRp bmcgZGF0YWJhc2UsIHJ1bgorICAgICAgICAgICAgIkFMVEVSIFRBQkxFIGNvbW1pdHMgUkVOQU1F IGNvbW1pdF9wYXJlbnQgVE8gY29tbWl0X3ByZXZpb3VzX2NvbW1pdDsiCisgICAgICAgIHRvIHVw ZGF0ZSB0aGUgZGF0YWJhc2UuCisKKyAgICAgICAgKiBpbml0LWRhdGFiYXNlLnNxbDoKKyAgICAg ICAgKiBwdWJsaWMvYXBpL3JlcG9ydC1jb21taXRzLnBocDoKKyAgICAgICAgKiBwdWJsaWMvaW5j bHVkZS9jb21taXQtbG9nLWZldGNoZXIucGhwOgorICAgICAgICAqIHNlcnZlci10ZXN0cy9hcGkt Y29tbWl0cy5qczoKKyAgICAgICAgKHRoZW4pOgorICAgICAgICAqIHNlcnZlci10ZXN0cy9hcGkt cmVwb3J0LWNvbW1pdHMtdGVzdHMuanM6CisgICAgICAgICh0aGVuKToKKyAgICAgICAgKiB0b29s cy9zeW5jLWNvbW1pdHMucHk6CisgICAgICAgIChtYWluKToKKyAgICAgICAgKFJlcG9zaXRvcnku ZmV0Y2hfY29tbWl0c19hbmRfc3VibWl0KToKKyAgICAgICAgKEdpdFJlcG9zaXRvcnkuX3Jldmlz aW9uX2Zyb21fdG9rZW5zKToKKyAgICAgICAgKiB1bml0LXRlc3RzL2FuYWx5c2lzLXRhc2stdGVz dHMuanM6CisgICAgICAgIChzYW1wbGVBbmFseXNpc1Rhc2spOgorCiAyMDE3LTAyLTIyICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCB0ZXN0cyBmb3IgSW50 ZXJhY3RpdmVUaW1lU2VyaWVzQ2hhcnQgYW5kIGFkb3B0IGFjdGlvbnMKZGlmZiAtLWdpdCBhL1dl YnNpdGVzL3BlcmYud2Via2l0Lm9yZy9pbml0LWRhdGFiYXNlLnNxbCBiL1dlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy9pbml0LWRhdGFiYXNlLnNxbAppbmRleCAyYjU2Y2UyMjY3YmViNGIxNTMzNjFk Njc2Y2EzNjgzZTYxY2VjNThhLi41YTNkZmNmNmM1ODQzMjU3MTk0ZDY4YzQ2ZWEzM2FhODhjNWFm OGJhIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvaW5pdC1kYXRhYmFzZS5z cWwKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL2luaXQtZGF0YWJhc2Uuc3FsCkBAIC04 OCw3ICs4OCw3IEBAIENSRUFURSBUQUJMRSBjb21taXRzICgKICAgICBjb21taXRfaWQgc2VyaWFs IFBSSU1BUlkgS0VZLAogICAgIGNvbW1pdF9yZXBvc2l0b3J5IGludGVnZXIgTk9UIE5VTEwgUkVG RVJFTkNFUyByZXBvc2l0b3JpZXMgT04gREVMRVRFIENBU0NBREUsCiAgICAgY29tbWl0X3Jldmlz aW9uIHZhcmNoYXIoNjQpIE5PVCBOVUxMLAotICAgIGNvbW1pdF9wYXJlbnQgaW50ZWdlciBSRUZF UkVOQ0VTIGNvbW1pdHMgT04gREVMRVRFIENBU0NBREUsCisgICAgY29tbWl0X3ByZXZpb3VzX2Nv bW1pdCBpbnRlZ2VyIFJFRkVSRU5DRVMgY29tbWl0cyBPTiBERUxFVEUgQ0FTQ0FERSwKICAgICBj b21taXRfdGltZSB0aW1lc3RhbXAsCiAgICAgY29tbWl0X29yZGVyIGludGVnZXIsCiAgICAgY29t bWl0X2NvbW1pdHRlciBpbnRlZ2VyIFJFRkVSRU5DRVMgY29tbWl0dGVycyBPTiBERUxFVEUgQ0FT Q0FERSwKQEAgLTI2MSw1ICsyNjEsNSBAQCBDUkVBVEUgVEFCTEUgYnVpbGRfcmVxdWVzdHMgKAog ICAgIHJlcXVlc3RfYnVpbGQgaW50ZWdlciBSRUZFUkVOQ0VTIGJ1aWxkcywKICAgICByZXF1ZXN0 X2NyZWF0ZWRfYXQgdGltZXN0YW1wIE5PVCBOVUxMIERFRkFVTFQgKENVUlJFTlRfVElNRVNUQU1Q IEFUIFRJTUUgWk9ORSAnVVRDJyksCiAgICAgQ09OU1RSQUlOVCBidWlsZF9yZXF1ZXN0X29yZGVy X211c3RfYmVfdW5pcXVlX2luX2dyb3VwIFVOSVFVRShyZXF1ZXN0X2dyb3VwLCByZXF1ZXN0X29y ZGVyKSk7Ci1DUkVBVEUgSU5ERVggYnVpbGRfcmVxdWVzdF90cmlnZ2VyYWJsZSBPTiBidWlsZF9y ZXF1ZXN0cyhyZXF1ZXN0X3RyaWdnZXJhYmxlKTsgICAgCitDUkVBVEUgSU5ERVggYnVpbGRfcmVx dWVzdF90cmlnZ2VyYWJsZSBPTiBidWlsZF9yZXF1ZXN0cyhyZXF1ZXN0X3RyaWdnZXJhYmxlKTsK IENSRUFURSBJTkRFWCBidWlsZF9yZXF1ZXN0X2J1aWxkIE9OIGJ1aWxkX3JlcXVlc3RzKHJlcXVl c3RfYnVpbGQpOwpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9h cGkvcmVwb3J0LWNvbW1pdHMucGhwIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9h cGkvcmVwb3J0LWNvbW1pdHMucGhwCmluZGV4IDBmMmY5Yjc2MzQ4M2M3N2YyNTAwNTI1YzJjNDY3 MjM5ZDBiZTMxYjkuLjU1YzJlODhhOGE5YzFkMTUyYzg5YTc2ZGMzY2U5MzY2NmIyNWQ3NzkgMTAw NjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvYXBpL3JlcG9ydC1jb21t aXRzLnBocAorKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL2FwaS9yZXBvcnQt Y29tbWl0cy5waHAKQEAgLTQ3LDIxICs0NywyMSBAQCBmdW5jdGlvbiBtYWluKCRwb3N0X2RhdGEp IHsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgICRwYXJlbnRfcmV2aXNpb24g PSBhcnJheV9nZXQoJGNvbW1pdF9pbmZvLCAncGFyZW50Jyk7Ci0gICAgICAgICRwYXJlbnRfaWQg PSBOVUxMOwotICAgICAgICBpZiAoJHBhcmVudF9yZXZpc2lvbikgewotICAgICAgICAgICAgJHBh cmVudF9jb21taXQgPSAkZGItPnNlbGVjdF9maXJzdF9yb3coJ2NvbW1pdHMnLCAnY29tbWl0Jywg YXJyYXkoJ3JlcG9zaXRvcnknID0+ICRyZXBvc2l0b3J5X2lkLCAncmV2aXNpb24nID0+ICRwYXJl bnRfcmV2aXNpb24pKTsKLSAgICAgICAgICAgIGlmICghJHBhcmVudF9jb21taXQpIHsKKyAgICAg ICAgJHByZXZpb3VzX2NvbW1pdF9yZXZpc2lvbiA9IGFycmF5X2dldCgkY29tbWl0X2luZm8sICdw cmV2aW91c19jb21taXQnKTsKKyAgICAgICAgJHByZXZpb3VzX2NvbW1pdF9pZCA9IE5VTEw7Cisg ICAgICAgIGlmICgkcHJldmlvdXNfY29tbWl0X3JldmlzaW9uKSB7CisgICAgICAgICAgICAkcHJl dmlvdXNfY29tbWl0ID0gJGRiLT5zZWxlY3RfZmlyc3Rfcm93KCdjb21taXRzJywgJ2NvbW1pdCcs IGFycmF5KCdyZXBvc2l0b3J5JyA9PiAkcmVwb3NpdG9yeV9pZCwgJ3JldmlzaW9uJyA9PiAkcHJl dmlvdXNfY29tbWl0X3JldmlzaW9uKSk7CisgICAgICAgICAgICBpZiAoISRwcmV2aW91c19jb21t aXQpIHsKICAgICAgICAgICAgICAgICAkZGItPnJvbGxiYWNrX3RyYW5zYWN0aW9uKCk7Ci0gICAg ICAgICAgICAgICAgZXhpdF93aXRoX2Vycm9yKCdGYWlsZWRUb0ZpbmRQYXJlbnRDb21taXQnLCBh cnJheSgnY29tbWl0JyA9PiAkY29tbWl0X2luZm8pKTsKKyAgICAgICAgICAgICAgICBleGl0X3dp dGhfZXJyb3IoJ0ZhaWxlZFRvRmluZFByZXZpb3VzQ29tbWl0JywgYXJyYXkoJ2NvbW1pdCcgPT4g JGNvbW1pdF9pbmZvKSk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAkcGFyZW50X2lkID0g JHBhcmVudF9jb21taXRbJ2NvbW1pdF9pZCddOworICAgICAgICAgICAgJHByZXZpb3VzX2NvbW1p dF9pZCA9ICRwcmV2aW91c19jb21taXRbJ2NvbW1pdF9pZCddOwogICAgICAgICB9CiAKICAgICAg ICAgJGRhdGEgPSBhcnJheSgKICAgICAgICAgICAgICdyZXBvc2l0b3J5JyA9PiAkcmVwb3NpdG9y eV9pZCwKICAgICAgICAgICAgICdyZXZpc2lvbicgPT4gJGNvbW1pdF9pbmZvWydyZXZpc2lvbidd LAotICAgICAgICAgICAgJ3BhcmVudCcgPT4gJHBhcmVudF9pZCwKKyAgICAgICAgICAgICdwcmV2 aW91c19jb21taXQnID0+ICRwcmV2aW91c19jb21taXRfaWQsCiAgICAgICAgICAgICAnb3JkZXIn ID0+IGFycmF5X2dldCgkY29tbWl0X2luZm8sICdvcmRlcicpLAogICAgICAgICAgICAgJ3RpbWUn ID0+IGFycmF5X2dldCgkY29tbWl0X2luZm8sICd0aW1lJyksCiAgICAgICAgICAgICAnY29tbWl0 dGVyJyA9PiAkY29tbWl0dGVyX2lkLApkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL3B1YmxpYy9pbmNsdWRlL2NvbW1pdC1sb2ctZmV0Y2hlci5waHAgYi9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvcHVibGljL2luY2x1ZGUvY29tbWl0LWxvZy1mZXRjaGVyLnBocAppbmRleCA4 ZTcxMGI2ZDA3YTRiZGRlYjdiNmNhMjQxZmU0YzNmNTc5Nzc0MDEzLi41ZDEyNjMwNGQ2MGU3NTk4 OGEzODBjM2JhYzE0NTYyZjJkZDU2OTAwIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtp dC5vcmcvcHVibGljL2luY2x1ZGUvY29tbWl0LWxvZy1mZXRjaGVyLnBocAorKysgYi9XZWJzaXRl cy9wZXJmLndlYmtpdC5vcmcvcHVibGljL2luY2x1ZGUvY29tbWl0LWxvZy1mZXRjaGVyLnBocApA QCAtMzYsNyArMzYsNyBAQCBjbGFzcyBDb21taXRMb2dGZXRjaGVyIHsKICAgICBmdW5jdGlvbiBm ZXRjaF9iZXR3ZWVuKCRyZXBvc2l0b3J5X2lkLCAkZmlyc3QsICRzZWNvbmQsICRrZXl3b3JkID0g TlVMTCkgewogICAgICAgICAkc3RhdGVtZW50cyA9ICdTRUxFQ1QgY29tbWl0X2lkIGFzICJpZCIs CiAgICAgICAgICAgICBjb21taXRfcmV2aXNpb24gYXMgInJldmlzaW9uIiwKLSAgICAgICAgICAg IGNvbW1pdF9wYXJlbnQgYXMgInBhcmVudCIsCisgICAgICAgICAgICBjb21taXRfcHJldmlvdXNf Y29tbWl0IGFzICJwcmV2aW91c19jb21taXQiLAogICAgICAgICAgICAgY29tbWl0X3RpbWUgYXMg InRpbWUiLAogICAgICAgICAgICAgY29tbWl0dGVyX25hbWUgYXMgImF1dGhvck5hbWUiLAogICAg ICAgICAgICAgY29tbWl0dGVyX2FjY291bnQgYXMgImF1dGhvckVtYWlsIiwKQEAgLTEyMSw3ICsx MjEsNyBAQCBjbGFzcyBDb21taXRMb2dGZXRjaGVyIHsKICAgICAgICAgcmV0dXJuIGFycmF5KAog ICAgICAgICAgICAgJ2lkJyA9PiAkY29tbWl0X3Jvd1snY29tbWl0X2lkJ10sCiAgICAgICAgICAg ICAncmV2aXNpb24nID0+ICRjb21taXRfcm93Wydjb21taXRfcmV2aXNpb24nXSwKLSAgICAgICAg ICAgICdwYXJlbnQnID0+ICRjb21taXRfcm93Wydjb21taXRfcGFyZW50J10sCisgICAgICAgICAg ICAncHJldmlvdXNfY29tbWl0JyA9PiAkY29tbWl0X3Jvd1snY29tbWl0X3ByZXZpb3VzX2NvbW1p dCddLAogICAgICAgICAgICAgJ3RpbWUnID0+IERhdGFiYXNlOjp0b19qc190aW1lKCRjb21taXRf cm93Wydjb21taXRfdGltZSddKSwKICAgICAgICAgICAgICdvcmRlcicgPT4gJGNvbW1pdF9yb3db J2NvbW1pdF9vcmRlciddLAogICAgICAgICAgICAgJ2F1dGhvck5hbWUnID0+ICRjb21taXR0ZXJf cm93ID8gJGNvbW1pdHRlcl9yb3dbJ2NvbW1pdHRlcl9uYW1lJ10gOiBudWxsLApAQCAtMTMxLDQg KzEzMSw0IEBAIGNsYXNzIENvbW1pdExvZ0ZldGNoZXIgewogICAgIH0KIH0KIAotPz4KXCBObyBu ZXdsaW5lIGF0IGVuZCBvZiBmaWxlCis/PgpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3NlcnZlci10ZXN0cy9hcGktY29tbWl0cy5qcyBiL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9zZXJ2ZXItdGVzdHMvYXBpLWNvbW1pdHMuanMKaW5kZXggYTkxNDY1MzE3ZjU1MzQxM2Ez MmMwYjBjZDYxMDIyYjY5N2YzZDg1ZC4uMGMwM2NiNWMwYzIxN2RjNmY1MGYxMzNlMTM2NGNhOThl Y2QzMmJhYiAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0 cy9hcGktY29tbWl0cy5qcworKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRl c3RzL2FwaS1jb21taXRzLmpzCkBAIC0zMCw3ICszMCw3IEBAIGRlc2NyaWJlKCIvYXBpL2NvbW1p dHMvIiwgKCkgPT4gewogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKICAgICAgICAgICAg ICAgICAicmVwb3NpdG9yeSI6ICJXZWJLaXQiLAotICAgICAgICAgICAgICAgICJwYXJlbnQiOiAi MjEwOTQ5IiwKKyAgICAgICAgICAgICAgICAicHJldmlvdXNfY29tbWl0IjogIjIxMDk0OSIsCiAg ICAgICAgICAgICAgICAgInJldmlzaW9uIjogIjIxMDk1MCIsCiAgICAgICAgICAgICAgICAgInRp bWUiOiAiMjAxNy0wMS0yMFQwMzo0OTozNy44ODdaIiwKICAgICAgICAgICAgICAgICAiYXV0aG9y IjogeyJuYW1lIjogIkNvbW1pdCBRdWV1ZSIsICJhY2NvdW50IjogImNvbW1pdC1xdWV1ZUB3ZWJr aXQub3JnIn0sCkBAIC04OSw3ICs4OSw3IEBAIGRlc2NyaWJlKCIvYXBpL2NvbW1pdHMvIiwgKCkg PT4gewogICAgICAgICAgICAgICAgIGFzc2VydENvbW1pdElzU2FtZUFzT25lU3VibWl0dGVkKGNv bW1pdHNbMV0sIHN1Ym1pdHRlZENvbW1pdHNbMV0pOwogICAgICAgICAgICAgICAgIGFzc2VydENv bW1pdElzU2FtZUFzT25lU3VibWl0dGVkKGNvbW1pdHNbMl0sIHN1Ym1pdHRlZENvbW1pdHNbMl0p OwogICAgICAgICAgICAgfSk7Ci0gICAgICAgIH0pOyAgICAgICAgCisgICAgICAgIH0pOwogICAg IH0pOwogCiAgICAgZGVzY3JpYmUoJy9hcGkvY29tbWl0cy88cmVwb3NpdG9yeT4vb2xkZXN0Jywg KCkgPT4gewpAQCAtMjMwLDcgKzIzMCw3IEBAIGRlc2NyaWJlKCIvYXBpL2NvbW1pdHMvIiwgKCkg PT4gewogICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXN1bHRbJ3N0YXR1cyddLCAnT0sn KTsKICAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVzdWx0Wydjb21taXRzJ10ubGVuZ3Ro LCAxKTsKICAgICAgICAgICAgICAgICBhc3NlcnRDb21taXRJc1NhbWVBc09uZVN1Ym1pdHRlZChy ZXN1bHRbJ2NvbW1pdHMnXVswXSwgewotICAgICAgICAgICAgICAgICAgICBwYXJlbnQ6IG51bGws CisgICAgICAgICAgICAgICAgICAgIHByZXZpb3VzX2NvbW1pdDogbnVsbCwKICAgICAgICAgICAg ICAgICAgICAgcmV2aXNpb246ICcyMTA5NTAnLAogICAgICAgICAgICAgICAgICAgICB0aW1lOiAn MjAxNy0wMS0yMFQwMzo0OTozNy44ODdaJywKICAgICAgICAgICAgICAgICAgICAgYXV0aG9yOiB7 bmFtZTogbnVsbCwgYWNjb3VudDogbnVsbH0sCkBAIC0yOTksMTQgKzI5OSwxNCBAQCBkZXNjcmli ZSgiL2FwaS9jb21taXRzLyIsICgpID0+IHsKICAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwo cmVzdWx0WydzdGF0dXMnXSwgJ09LJyk7CiAgICAgICAgICAgICAgICAgYXNzZXJ0LmRlZXBFcXVh bChyZXN1bHRbJ2NvbW1pdHMnXS5sZW5ndGgsIDIpOwogICAgICAgICAgICAgICAgIGFzc2VydENv bW1pdElzU2FtZUFzT25lU3VibWl0dGVkKHJlc3VsdFsnY29tbWl0cyddWzBdLCB7Ci0gICAgICAg ICAgICAgICAgICAgIHBhcmVudDogbnVsbCwKKyAgICAgICAgICAgICAgICAgICAgcHJldmlvdXNf Y29tbWl0OiBudWxsLAogICAgICAgICAgICAgICAgICAgICByZXZpc2lvbjogJzIxMDk0OScsCiAg ICAgICAgICAgICAgICAgICAgIHRpbWU6ICcyMDE3LTAxLTIwVDAzOjIzOjUwLjY0NVonLAogICAg ICAgICAgICAgICAgICAgICBhdXRob3I6IHtuYW1lOiBudWxsLCBhY2NvdW50OiBudWxsfSwKICAg ICAgICAgICAgICAgICAgICAgbWVzc2FnZTogbnVsbCwKICAgICAgICAgICAgICAgICB9KTsKICAg ICAgICAgICAgICAgICBhc3NlcnRDb21taXRJc1NhbWVBc09uZVN1Ym1pdHRlZChyZXN1bHRbJ2Nv bW1pdHMnXVsxXSwgewotICAgICAgICAgICAgICAgICAgICBwYXJlbnQ6IG51bGwsCisgICAgICAg ICAgICAgICAgICAgIHByZXZpb3VzX2NvbW1pdDogbnVsbCwKICAgICAgICAgICAgICAgICAgICAg cmV2aXNpb246ICcyMTA5NTAnLAogICAgICAgICAgICAgICAgICAgICB0aW1lOiAnMjAxNy0wMS0y MFQwMzo0OTozNy44ODdaJywKICAgICAgICAgICAgICAgICAgICAgYXV0aG9yOiB7bmFtZTogbnVs bCwgYWNjb3VudDogbnVsbH0sCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcv c2VydmVyLXRlc3RzL2FwaS1yZXBvcnQtY29tbWl0cy10ZXN0cy5qcyBiL1dlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvYXBpLXJlcG9ydC1jb21taXRzLXRlc3RzLmpzCmluZGV4 IGJjMDc4MTc0YWIyZGJlOWJhOTliOGZmMDQ4MDg1ZDk2ZTM1NmYyZWMuLjQxZTYxNGM5OTA2MzBk ZTYzMGZjNjUxOTE1Njg4NDg5NTJmODM1OTQgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Vi a2l0Lm9yZy9zZXJ2ZXItdGVzdHMvYXBpLXJlcG9ydC1jb21taXRzLXRlc3RzLmpzCisrKyBiL1dl YnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvYXBpLXJlcG9ydC1jb21taXRzLXRl c3RzLmpzCkBAIC01NCw3ICs1NCw3IEBAIGRlc2NyaWJlKCIvYXBpL3JlcG9ydC1jb21taXRzLyIs IGZ1bmN0aW9uICgpIHsKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CiAgICAgICAgICAg ICAgICAgInJlcG9zaXRvcnkiOiAiV2ViS2l0IiwKLSAgICAgICAgICAgICAgICAicGFyZW50Ijog IjE0MTk3NyIsCisgICAgICAgICAgICAgICAgInByZXZpb3VzX2NvbW1pdCI6ICIxNDE5NzciLAog ICAgICAgICAgICAgICAgICJyZXZpc2lvbiI6ICIxNDE5NzgiLAogICAgICAgICAgICAgICAgICJ0 aW1lIjogIjIwMTMtMDItMDZUMDk6NTQ6NTYuMFoiLAogICAgICAgICAgICAgICAgICJhdXRob3Ii OiB7Im5hbWUiOiAiTWlraGFpbCBQb3pkbnlha292IiwgImFjY291bnQiOiAibWlraGFpbC5wb3pk bnlha292QGludGVsLmNvbSJ9LApAQCAtMjI3LDcgKzIyNyw3IEBAIGRlc2NyaWJlKCIvYXBpL3Jl cG9ydC1jb21taXRzLyIsIGZ1bmN0aW9uICgpIHsKICAgICAgICAgICAgIGFzc2VydC5lcXVhbChj b21taXRzWzBdWydjb21taXR0ZXInXSwgY29tbWl0dGVyc1swXVsnaWQnXSk7CiAgICAgICAgICAg ICBhc3NlcnQuZXF1YWwoY29tbWl0dGVyc1swXVsnbmFtZSddLCBmaXJzdERhdGFbJ2F1dGhvcidd WyduYW1lJ10pOwogICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKGNvbW1pdHRlcnNbMF1bJ2FjY291 bnQnXSwgZmlyc3REYXRhWydhdXRob3InXVsnYWNjb3VudCddKTsKLSAgICAgICAgICAgIAorCiAg ICAgICAgICAgICBhc3NlcnQuZXF1YWwoY29tbWl0c1sxXVsnaWQnXSwgMyk7CiAgICAgICAgICAg ICBhc3NlcnQuZXF1YWwoY29tbWl0c1sxXVsnbWVzc2FnZSddLCBudWxsKTsKICAgICAgICAgICAg IGFzc2VydC5lcXVhbChjb21taXRzWzFdWydjb21taXR0ZXInXSwgbnVsbCk7CmRpZmYgLS1naXQg YS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvc3luYy1jb21taXRzLnB5IGIvV2Vic2l0 ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL3N5bmMtY29tbWl0cy5weQppbmRleCA1YjVkZWQwNDJm ZjJhZmRiYzc3ZmIwYmQ5YjAzNjU3OGU5NzJkYzEwLi4zN2E4NGRlMTEzODg5NGZmYzgyYmVlY2Rk ODAxNjdkNzI1YTA2MWY3IDEwMDc1NQotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9v bHMvc3luYy1jb21taXRzLnB5CisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9z eW5jLWNvbW1pdHMucHkKQEAgLTIzLDcgKzIzLDcgQEAgZGVmIG1haW4oYXJndik6CiAgICAgcGFy c2VyLmFkZF9hcmd1bWVudCgnLS1zZXJ2ZXItY29uZmlnLWpzb24nLCByZXF1aXJlZD1UcnVlLCBo ZWxwPSdUaGUgcGF0aCB0byBhIEpTT04gZmlsZSB0aGF0IHNwZWNpZmllcyB0aGUgcGVyZiBkYXNo Ym9hcmQnKQogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy0tc2Vjb25kcy10by1zbGVlcCcsIHR5 cGU9ZmxvYXQsIGRlZmF1bHQ9OTAwLCBoZWxwPSdUaGUgc2Vjb25kcyB0byBzbGVlcCBiZXR3ZWVu IGl0ZXJhdGlvbnMnKQogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy0tbWF4LWZldGNoLWNvdW50 JywgdHlwZT1pbnQsIGRlZmF1bHQ9MTAsIGhlbHA9J1RoZSBudW1iZXIgb2YgY29tbWl0cyB0byBm ZXRjaCBhdCBvbmNlJykKLSAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLW1heC1hbmNlc3Rvci1m ZXRjaC1jb3VudCcsIHR5cGU9aW50LCBkZWZhdWx0PTEwMCwgaGVscD0nVGhlIG51bWJlciBvZiBj b21taXRzIHRvIGZldGNoIGF0IG9uY2UgaWYgc29tZSBjb21taXRzIGFyZSBtaXNzaW5nIHBhcmVu dHMnKQorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy0tbWF4LWFuY2VzdG9yLWZldGNoLWNvdW50 JywgdHlwZT1pbnQsIGRlZmF1bHQ9MTAwLCBoZWxwPSdUaGUgbnVtYmVyIG9mIGNvbW1pdHMgdG8g ZmV0Y2ggYXQgb25jZSBpZiBzb21lIGNvbW1pdHMgYXJlIG1pc3NpbmcgcHJldmlvdXMgY29tbWl0 cycpCiAgICAgYXJncyA9IHBhcnNlci5wYXJzZV9hcmdzKCkKIAogICAgIHdpdGggb3Blbihhcmdz LnJlcG9zaXRvcnlfY29uZmlnX2pzb24pIGFzIHJlcG9zaXRvcnlfY29uZmlnX2pzb246CkBAIC03 OSwxNiArNzksMTYgQEAgY2xhc3MgUmVwb3NpdG9yeShvYmplY3QpOgogICAgICAgICAgICAgcHJp bnQgIlN1Ym1pdHRpbmcgcmV2aXNpb25zICVzIGZvciAlcyB0byAlcyIgJSAocmV2aXNpb25fbGlz dCwgc2VsZi5fbmFtZSwgc2VydmVyX2NvbmZpZ1snc2VydmVyJ11bJ3VybCddKQogCiAgICAgICAg ICAgICByZXN1bHQgPSBzdWJtaXRfY29tbWl0cyhwZW5kaW5nX2NvbW1pdHMsIHNlcnZlcl9jb25m aWdbJ3NlcnZlciddWyd1cmwnXSwKLSAgICAgICAgICAgICAgICBzZXJ2ZXJfY29uZmlnWydzbGF2 ZSddWyduYW1lJ10sIHNlcnZlcl9jb25maWdbJ3NsYXZlJ11bJ3Bhc3N3b3JkJ10sIFsnT0snLCAn RmFpbGVkVG9GaW5kUGFyZW50Q29tbWl0J10pCisgICAgICAgICAgICAgICAgc2VydmVyX2NvbmZp Z1snc2xhdmUnXVsnbmFtZSddLCBzZXJ2ZXJfY29uZmlnWydzbGF2ZSddWydwYXNzd29yZCddLCBb J09LJywgJ0ZhaWxlZFRvRmluZFByZXZpb3VzQ29tbWl0J10pCiAKICAgICAgICAgICAgIGlmIHJl c3VsdC5nZXQoJ3N0YXR1cycpID09ICdPSyc6CiAgICAgICAgICAgICAgICAgYnJlYWsKIAotICAg ICAgICAgICAgaWYgcmVzdWx0LmdldCgnc3RhdHVzJykgPT0gJ0ZhaWxlZFRvRmluZFBhcmVudENv bW1pdCc6Ci0gICAgICAgICAgICAgICAgcGFyZW50X2NvbW1pdCA9IHNlbGYuZmV0Y2hfY29tbWl0 KHNlcnZlcl9jb25maWcsIHJlc3VsdFsnY29tbWl0J11bJ3BhcmVudCddKQotICAgICAgICAgICAg ICAgIGlmIG5vdCBwYXJlbnRfY29tbWl0OgotICAgICAgICAgICAgICAgICAgICByYWlzZSBFeGNl cHRpb24oJ0NvdWxkIG5vdCBmaW5kIHRoZSBwYXJlbnQgJXMgb2YgJXMnICUgKHJlc3VsdFsnY29t bWl0J11bJ3BhcmVudCddLCByZXN1bHRbJ2NvbW1pdCddWydyZXZpc2lvbiddKSkKLSAgICAgICAg ICAgICAgICBwZW5kaW5nX2NvbW1pdHMgPSBbcGFyZW50X2NvbW1pdF0gKyBwZW5kaW5nX2NvbW1p dHMKKyAgICAgICAgICAgIGlmIHJlc3VsdC5nZXQoJ3N0YXR1cycpID09ICdGYWlsZWRUb0ZpbmRQ cmV2aW91c0NvbW1pdCc6CisgICAgICAgICAgICAgICAgcHJldmlvdXNfY29tbWl0ID0gc2VsZi5m ZXRjaF9jb21taXQoc2VydmVyX2NvbmZpZywgcmVzdWx0Wydjb21taXQnXVsncHJldmlvdXNfY29t bWl0J10pCisgICAgICAgICAgICAgICAgaWYgbm90IHByZXZpb3VzX2NvbW1pdDoKKyAgICAgICAg ICAgICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCdDb3VsZCBub3QgZmluZCB0aGUgcHJldmlvdXMg Y29tbWl0ICVzIG9mICVzJyAlIChyZXN1bHRbJ2NvbW1pdCddWydwcmV2aW91c19jb21taXQnXSwg cmVzdWx0Wydjb21taXQnXVsncmV2aXNpb24nXSkpCisgICAgICAgICAgICAgICAgcGVuZGluZ19j b21taXRzID0gW3ByZXZpb3VzX2NvbW1pdF0gKyBwZW5kaW5nX2NvbW1pdHMKIAogICAgICAgICBp ZiByZXN1bHQuZ2V0KCdzdGF0dXMnKSAhPSAnT0snOgogICAgICAgICAgICAgcmFpc2UgRXhjZXB0 aW9uKHJlc3VsdCkKQEAgLTIyMyw3ICsyMjMsNyBAQCBjbGFzcyBHaXRSZXBvc2l0b3J5KFJlcG9z aXRvcnkpOgogICAgICAgICBjdXJyZW50X2hhc2ggPSB0b2tlbnNbMF0KICAgICAgICAgY29tbWl0 X3RpbWUgPSBpbnQodG9rZW5zWzFdKQogICAgICAgICBhdXRob3JfZW1haWwgPSB0b2tlbnNbMl0K LSAgICAgICAgcGFyZW50X2hhc2ggPSB0b2tlbnNbM10gaWYgbGVuKHRva2VucykgPj0gNCBlbHNl IE5vbmUKKyAgICAgICAgcHJldmlvdXNfaGFzaCA9IHRva2Vuc1szXSBpZiBsZW4odG9rZW5zKSA+ PSA0IGVsc2UgTm9uZQogCiAgICAgICAgIGF1dGhvcl9uYW1lID0gc2VsZi5fcnVuX2dpdF9jb21t YW5kKFsnbG9nJywgY3VycmVudF9oYXNoLCAnLTEnLCAnLS1wcmV0dHk9JWNuJ10pCiAgICAgICAg IG1lc3NhZ2UgPSBzZWxmLl9ydW5fZ2l0X2NvbW1hbmQoWydsb2cnLCBjdXJyZW50X2hhc2gsICct MScsICctLXByZXR0eT0lQiddKQpAQCAtMjMxLDcgKzIzMSw3IEBAIGNsYXNzIEdpdFJlcG9zaXRv cnkoUmVwb3NpdG9yeSk6CiAgICAgICAgIHJldHVybiB7CiAgICAgICAgICAgICAncmVwb3NpdG9y eSc6IHNlbGYuX25hbWUsCiAgICAgICAgICAgICAncmV2aXNpb24nOiBjdXJyZW50X2hhc2gsCi0g ICAgICAgICAgICAncGFyZW50JzogcGFyZW50X2hhc2gsCisgICAgICAgICAgICAncHJldmlvdXNf Y29tbWl0JzogcHJldmlvdXNfaGFzaCwKICAgICAgICAgICAgICd0aW1lJzogZGF0ZXRpbWUuZnJv bXRpbWVzdGFtcChjb21taXRfdGltZSkuc3RyZnRpbWUociclWS0lbS0lZFQlSDolTTolUy4lZicp LAogICAgICAgICAgICAgJ2F1dGhvcic6IHsnYWNjb3VudCc6IGF1dGhvcl9lbWFpbCwgJ25hbWUn OiBhdXRob3JfbmFtZX0sCiAgICAgICAgICAgICAnbWVzc2FnZSc6IG1lc3NhZ2UsCmRpZmYgLS1n aXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9hbmFseXNpcy10YXNrLXRl c3RzLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVzdHMvYW5hbHlzaXMtdGFz ay10ZXN0cy5qcwppbmRleCAzYTM5ZWZiMmVmNWE5Y2MzNjM4NGFhYzc1NzcxNTRmMmI0MzJmZGE1 Li42Zjk3ZDMyZTA1YjA2YWIzNzcyMTE0YjMxMjA2ZThiMDNmZDllOGYxIDEwMDY0NAotLS0gYS9X ZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9hbmFseXNpcy10YXNrLXRlc3RzLmpz CisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRlc3RzL2FuYWx5c2lzLXRhc2st dGVzdHMuanMKQEAgLTQzLDcgKzQzLDcgQEAgZnVuY3Rpb24gc2FtcGxlQW5hbHlzaXNUYXNrKCkK ICAgICAgICAgICAgICAgICAnaWQnOiAnMTA1OTc1JywKICAgICAgICAgICAgICAgICAnbWVzc2Fn ZSc6ICdDb21taXQgbWVzc2FnZScsCiAgICAgICAgICAgICAgICAgJ29yZGVyJzogbnVsbCwKLSAg ICAgICAgICAgICAgICAncGFyZW50JzogbnVsbCwKKyAgICAgICAgICAgICAgICAncHJldmlvdXNf Y29tbWl0JzogbnVsbCwKICAgICAgICAgICAgICAgICAncmVwb3NpdG9yeSc6ICcxMScsCiAgICAg ICAgICAgICAgICAgJ3JldmlzaW9uJzogJzE5NjA1MScsCiAgICAgICAgICAgICAgICAgJ3RpbWUn OiAxNDU0NDgxMjQ2MTA4Cg== 302644 2017-02-23 22:39:51 -0800 2017-02-23 23:19:36 -0800 Patch for landing bug-168816-20170223223702.patch text/plain 17174 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyOTQyCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA4MjMzMTYyZDc1N2E4OTQ5NGQxNTYxZWE1ZDg5YmIwOGU4YmE5N2IxLi40ZmJkMDRjNmE3 NmZkYjZhZmViY2ZiZjQ3OTA1ZjY4MWM0N2FjNzQyIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxNy0wMi0yMyAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgJ2NvbW1pdF9wYXJlbnQnIGluICdjb21taXRz JyB0YWJsZSB0byAnY29tbWl0X3ByZXZpb3VzX2NvbW1pdCcuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjg4MTYKKworICAgICAgICBSZXZpZXdlZCBi eSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAgUmVuYW1lICdjb21taXRfcGFyZW50JyB0byBhdm9p ZCBhbWJpZ3VpdHkgaW4gdGhlIGNvbWluZyBmZWF0dXJlLgorICAgICAgICBGb3IgZXhpc2l0aW5n IGRhdGFiYXNlLCBydW4KKyAgICAgICAgICAgICJBTFRFUiBUQUJMRSBjb21taXRzIFJFTkFNRSBj b21taXRfcGFyZW50IFRPIGNvbW1pdF9wcmV2aW91c19jb21taXQ7IgorICAgICAgICB0byB1cGRh dGUgdGhlIGRhdGFiYXNlLgorCisgICAgICAgICogaW5pdC1kYXRhYmFzZS5zcWw6CisgICAgICAg ICogcHVibGljL2FwaS9yZXBvcnQtY29tbWl0cy5waHA6CisgICAgICAgICogcHVibGljL2luY2x1 ZGUvY29tbWl0LWxvZy1mZXRjaGVyLnBocDoKKyAgICAgICAgKiBzZXJ2ZXItdGVzdHMvYXBpLWNv bW1pdHMuanM6CisgICAgICAgICh0aGVuKToKKyAgICAgICAgKiBzZXJ2ZXItdGVzdHMvYXBpLXJl cG9ydC1jb21taXRzLXRlc3RzLmpzOgorICAgICAgICAodGhlbik6CisgICAgICAgICogdG9vbHMv c3luYy1jb21taXRzLnB5OgorICAgICAgICAobWFpbik6CisgICAgICAgIChSZXBvc2l0b3J5LmZl dGNoX2NvbW1pdHNfYW5kX3N1Ym1pdCk6CisgICAgICAgIChHaXRSZXBvc2l0b3J5Ll9yZXZpc2lv bl9mcm9tX3Rva2Vucyk6CisgICAgICAgICogdW5pdC10ZXN0cy9hbmFseXNpcy10YXNrLXRlc3Rz LmpzOgorICAgICAgICAoc2FtcGxlQW5hbHlzaXNUYXNrKToKKwogMjAxNy0wMi0yMyAgUnlvc3Vr ZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyMTI1NDIp OiBNYWtlIFRpbWVTZXJpZXNDaGFydC5jb21wdXRlVGltZUdyaWQgc3RvcHMgeC1heGlzIGdyaWQg cHJlbWF0dXJlbHkKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9pbml0LWRh dGFiYXNlLnNxbCBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9pbml0LWRhdGFiYXNlLnNxbApp bmRleCAyYjU2Y2UyMjY3YmViNGIxNTMzNjFkNjc2Y2EzNjgzZTYxY2VjNThhLi41YTNkZmNmNmM1 ODQzMjU3MTk0ZDY4YzQ2ZWEzM2FhODhjNWFmOGJhIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvaW5pdC1kYXRhYmFzZS5zcWwKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL2luaXQtZGF0YWJhc2Uuc3FsCkBAIC04OCw3ICs4OCw3IEBAIENSRUFURSBUQUJMRSBjb21t aXRzICgKICAgICBjb21taXRfaWQgc2VyaWFsIFBSSU1BUlkgS0VZLAogICAgIGNvbW1pdF9yZXBv c2l0b3J5IGludGVnZXIgTk9UIE5VTEwgUkVGRVJFTkNFUyByZXBvc2l0b3JpZXMgT04gREVMRVRF IENBU0NBREUsCiAgICAgY29tbWl0X3JldmlzaW9uIHZhcmNoYXIoNjQpIE5PVCBOVUxMLAotICAg IGNvbW1pdF9wYXJlbnQgaW50ZWdlciBSRUZFUkVOQ0VTIGNvbW1pdHMgT04gREVMRVRFIENBU0NB REUsCisgICAgY29tbWl0X3ByZXZpb3VzX2NvbW1pdCBpbnRlZ2VyIFJFRkVSRU5DRVMgY29tbWl0 cyBPTiBERUxFVEUgQ0FTQ0FERSwKICAgICBjb21taXRfdGltZSB0aW1lc3RhbXAsCiAgICAgY29t bWl0X29yZGVyIGludGVnZXIsCiAgICAgY29tbWl0X2NvbW1pdHRlciBpbnRlZ2VyIFJFRkVSRU5D RVMgY29tbWl0dGVycyBPTiBERUxFVEUgQ0FTQ0FERSwKQEAgLTI2MSw1ICsyNjEsNSBAQCBDUkVB VEUgVEFCTEUgYnVpbGRfcmVxdWVzdHMgKAogICAgIHJlcXVlc3RfYnVpbGQgaW50ZWdlciBSRUZF UkVOQ0VTIGJ1aWxkcywKICAgICByZXF1ZXN0X2NyZWF0ZWRfYXQgdGltZXN0YW1wIE5PVCBOVUxM IERFRkFVTFQgKENVUlJFTlRfVElNRVNUQU1QIEFUIFRJTUUgWk9ORSAnVVRDJyksCiAgICAgQ09O U1RSQUlOVCBidWlsZF9yZXF1ZXN0X29yZGVyX211c3RfYmVfdW5pcXVlX2luX2dyb3VwIFVOSVFV RShyZXF1ZXN0X2dyb3VwLCByZXF1ZXN0X29yZGVyKSk7Ci1DUkVBVEUgSU5ERVggYnVpbGRfcmVx dWVzdF90cmlnZ2VyYWJsZSBPTiBidWlsZF9yZXF1ZXN0cyhyZXF1ZXN0X3RyaWdnZXJhYmxlKTsg ICAgCitDUkVBVEUgSU5ERVggYnVpbGRfcmVxdWVzdF90cmlnZ2VyYWJsZSBPTiBidWlsZF9yZXF1 ZXN0cyhyZXF1ZXN0X3RyaWdnZXJhYmxlKTsKIENSRUFURSBJTkRFWCBidWlsZF9yZXF1ZXN0X2J1 aWxkIE9OIGJ1aWxkX3JlcXVlc3RzKHJlcXVlc3RfYnVpbGQpOwpkaWZmIC0tZ2l0IGEvV2Vic2l0 ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9hcGkvcmVwb3J0LWNvbW1pdHMucGhwIGIvV2Vic2l0 ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9hcGkvcmVwb3J0LWNvbW1pdHMucGhwCmluZGV4IDBm MmY5Yjc2MzQ4M2M3N2YyNTAwNTI1YzJjNDY3MjM5ZDBiZTMxYjkuLmZiMmNhYjQwZDFiMzlkZTUw NjExNTgyM2M3MmJmZmRhMDQxMjBlYmEgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9wdWJsaWMvYXBpL3JlcG9ydC1jb21taXRzLnBocAorKysgYi9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvcHVibGljL2FwaS9yZXBvcnQtY29tbWl0cy5waHAKQEAgLTQ3LDIxICs0NywyMSBA QCBmdW5jdGlvbiBtYWluKCRwb3N0X2RhdGEpIHsKICAgICAgICAgICAgIH0KICAgICAgICAgfQog Ci0gICAgICAgICRwYXJlbnRfcmV2aXNpb24gPSBhcnJheV9nZXQoJGNvbW1pdF9pbmZvLCAncGFy ZW50Jyk7Ci0gICAgICAgICRwYXJlbnRfaWQgPSBOVUxMOwotICAgICAgICBpZiAoJHBhcmVudF9y ZXZpc2lvbikgewotICAgICAgICAgICAgJHBhcmVudF9jb21taXQgPSAkZGItPnNlbGVjdF9maXJz dF9yb3coJ2NvbW1pdHMnLCAnY29tbWl0JywgYXJyYXkoJ3JlcG9zaXRvcnknID0+ICRyZXBvc2l0 b3J5X2lkLCAncmV2aXNpb24nID0+ICRwYXJlbnRfcmV2aXNpb24pKTsKLSAgICAgICAgICAgIGlm ICghJHBhcmVudF9jb21taXQpIHsKKyAgICAgICAgJHByZXZpb3VzX2NvbW1pdF9yZXZpc2lvbiA9 IGFycmF5X2dldCgkY29tbWl0X2luZm8sICdwcmV2aW91c0NvbW1pdCcpOworICAgICAgICAkcHJl dmlvdXNfY29tbWl0X2lkID0gTlVMTDsKKyAgICAgICAgaWYgKCRwcmV2aW91c19jb21taXRfcmV2 aXNpb24pIHsKKyAgICAgICAgICAgICRwcmV2aW91c19jb21taXQgPSAkZGItPnNlbGVjdF9maXJz dF9yb3coJ2NvbW1pdHMnLCAnY29tbWl0JywgYXJyYXkoJ3JlcG9zaXRvcnknID0+ICRyZXBvc2l0 b3J5X2lkLCAncmV2aXNpb24nID0+ICRwcmV2aW91c19jb21taXRfcmV2aXNpb24pKTsKKyAgICAg ICAgICAgIGlmICghJHByZXZpb3VzX2NvbW1pdCkgewogICAgICAgICAgICAgICAgICRkYi0+cm9s bGJhY2tfdHJhbnNhY3Rpb24oKTsKLSAgICAgICAgICAgICAgICBleGl0X3dpdGhfZXJyb3IoJ0Zh aWxlZFRvRmluZFBhcmVudENvbW1pdCcsIGFycmF5KCdjb21taXQnID0+ICRjb21taXRfaW5mbykp OworICAgICAgICAgICAgICAgIGV4aXRfd2l0aF9lcnJvcignRmFpbGVkVG9GaW5kUHJldmlvdXND b21taXQnLCBhcnJheSgnY29tbWl0JyA9PiAkY29tbWl0X2luZm8pKTsKICAgICAgICAgICAgIH0K LSAgICAgICAgICAgICRwYXJlbnRfaWQgPSAkcGFyZW50X2NvbW1pdFsnY29tbWl0X2lkJ107Cisg ICAgICAgICAgICAkcHJldmlvdXNfY29tbWl0X2lkID0gJHByZXZpb3VzX2NvbW1pdFsnY29tbWl0 X2lkJ107CiAgICAgICAgIH0KIAogICAgICAgICAkZGF0YSA9IGFycmF5KAogICAgICAgICAgICAg J3JlcG9zaXRvcnknID0+ICRyZXBvc2l0b3J5X2lkLAogICAgICAgICAgICAgJ3JldmlzaW9uJyA9 PiAkY29tbWl0X2luZm9bJ3JldmlzaW9uJ10sCi0gICAgICAgICAgICAncGFyZW50JyA9PiAkcGFy ZW50X2lkLAorICAgICAgICAgICAgJ3ByZXZpb3VzX2NvbW1pdCcgPT4gJHByZXZpb3VzX2NvbW1p dF9pZCwKICAgICAgICAgICAgICdvcmRlcicgPT4gYXJyYXlfZ2V0KCRjb21taXRfaW5mbywgJ29y ZGVyJyksCiAgICAgICAgICAgICAndGltZScgPT4gYXJyYXlfZ2V0KCRjb21taXRfaW5mbywgJ3Rp bWUnKSwKICAgICAgICAgICAgICdjb21taXR0ZXInID0+ICRjb21taXR0ZXJfaWQsCmRpZmYgLS1n aXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL2luY2x1ZGUvY29tbWl0LWxvZy1m ZXRjaGVyLnBocCBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvaW5jbHVkZS9jb21t aXQtbG9nLWZldGNoZXIucGhwCmluZGV4IDhlNzEwYjZkMDdhNGJkZGViN2I2Y2EyNDFmZTRjM2Y1 Nzk3NzQwMTMuLjBiNzZkMjQwN2RlMTM2YWNjYmY2ZWE1NmJjMTQ3ZjE2MGE1NWQ2MGYgMTAwNjQ0 Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvaW5jbHVkZS9jb21taXQtbG9n LWZldGNoZXIucGhwCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvaW5jbHVk ZS9jb21taXQtbG9nLWZldGNoZXIucGhwCkBAIC0zNiw3ICszNiw3IEBAIGNsYXNzIENvbW1pdExv Z0ZldGNoZXIgewogICAgIGZ1bmN0aW9uIGZldGNoX2JldHdlZW4oJHJlcG9zaXRvcnlfaWQsICRm aXJzdCwgJHNlY29uZCwgJGtleXdvcmQgPSBOVUxMKSB7CiAgICAgICAgICRzdGF0ZW1lbnRzID0g J1NFTEVDVCBjb21taXRfaWQgYXMgImlkIiwKICAgICAgICAgICAgIGNvbW1pdF9yZXZpc2lvbiBh cyAicmV2aXNpb24iLAotICAgICAgICAgICAgY29tbWl0X3BhcmVudCBhcyAicGFyZW50IiwKKyAg ICAgICAgICAgIGNvbW1pdF9wcmV2aW91c19jb21taXQgYXMgInByZXZpb3VzQ29tbWl0IiwKICAg ICAgICAgICAgIGNvbW1pdF90aW1lIGFzICJ0aW1lIiwKICAgICAgICAgICAgIGNvbW1pdHRlcl9u YW1lIGFzICJhdXRob3JOYW1lIiwKICAgICAgICAgICAgIGNvbW1pdHRlcl9hY2NvdW50IGFzICJh dXRob3JFbWFpbCIsCkBAIC0xMjEsNyArMTIxLDcgQEAgY2xhc3MgQ29tbWl0TG9nRmV0Y2hlciB7 CiAgICAgICAgIHJldHVybiBhcnJheSgKICAgICAgICAgICAgICdpZCcgPT4gJGNvbW1pdF9yb3db J2NvbW1pdF9pZCddLAogICAgICAgICAgICAgJ3JldmlzaW9uJyA9PiAkY29tbWl0X3Jvd1snY29t bWl0X3JldmlzaW9uJ10sCi0gICAgICAgICAgICAncGFyZW50JyA9PiAkY29tbWl0X3Jvd1snY29t bWl0X3BhcmVudCddLAorICAgICAgICAgICAgJ3ByZXZpb3VzQ29tbWl0JyA9PiAkY29tbWl0X3Jv d1snY29tbWl0X3ByZXZpb3VzX2NvbW1pdCddLAogICAgICAgICAgICAgJ3RpbWUnID0+IERhdGFi YXNlOjp0b19qc190aW1lKCRjb21taXRfcm93Wydjb21taXRfdGltZSddKSwKICAgICAgICAgICAg ICdvcmRlcicgPT4gJGNvbW1pdF9yb3dbJ2NvbW1pdF9vcmRlciddLAogICAgICAgICAgICAgJ2F1 dGhvck5hbWUnID0+ICRjb21taXR0ZXJfcm93ID8gJGNvbW1pdHRlcl9yb3dbJ2NvbW1pdHRlcl9u YW1lJ10gOiBudWxsLApAQCAtMTMxLDQgKzEzMSw0IEBAIGNsYXNzIENvbW1pdExvZ0ZldGNoZXIg ewogICAgIH0KIH0KIAotPz4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCis/PgpkaWZmIC0t Z2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9hcGktY29tbWl0cy5q cyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvYXBpLWNvbW1pdHMuanMK aW5kZXggYTkxNDY1MzE3ZjU1MzQxM2EzMmMwYjBjZDYxMDIyYjY5N2YzZDg1ZC4uYTQyYzYwZGM3 NjdiODgwYzU0NzUwOGVjNGNkODU1MzVkMzlhOGI3OSAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVy Zi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9hcGktY29tbWl0cy5qcworKysgYi9XZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL2FwaS1jb21taXRzLmpzCkBAIC0zMCw3ICszMCw3 IEBAIGRlc2NyaWJlKCIvYXBpL2NvbW1pdHMvIiwgKCkgPT4gewogICAgICAgICAgICAgfSwKICAg ICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAicmVwb3NpdG9yeSI6ICJXZWJLaXQiLAotICAg ICAgICAgICAgICAgICJwYXJlbnQiOiAiMjEwOTQ5IiwKKyAgICAgICAgICAgICAgICAicHJldmlv dXNDb21taXQiOiAiMjEwOTQ5IiwKICAgICAgICAgICAgICAgICAicmV2aXNpb24iOiAiMjEwOTUw IiwKICAgICAgICAgICAgICAgICAidGltZSI6ICIyMDE3LTAxLTIwVDAzOjQ5OjM3Ljg4N1oiLAog ICAgICAgICAgICAgICAgICJhdXRob3IiOiB7Im5hbWUiOiAiQ29tbWl0IFF1ZXVlIiwgImFjY291 bnQiOiAiY29tbWl0LXF1ZXVlQHdlYmtpdC5vcmcifSwKQEAgLTUxLDYgKzUxLDExIEBAIGRlc2Ny aWJlKCIvYXBpL2NvbW1pdHMvIiwgKCkgPT4gewogICAgICAgICBhc3NlcnQuZXF1YWwoY29tbWl0 WydtZXNzYWdlJ10sIHN1Ym1pdHRlZFsnbWVzc2FnZSddKTsKICAgICAgICAgYXNzZXJ0LmVxdWFs KGNvbW1pdFsnYXV0aG9yTmFtZSddLCBzdWJtaXR0ZWRbJ2F1dGhvciddWyduYW1lJ10pOwogICAg ICAgICBhc3NlcnQuZXF1YWwoY29tbWl0WydhdXRob3JFbWFpbCddLCBzdWJtaXR0ZWRbJ2F1dGhv ciddWydhY2NvdW50J10pOworICAgICAgICBpZihzdWJtaXR0ZWRbJ3ByZXZpb3VzQ29tbWl0J10p IHsKKyAgICAgICAgICAgIGFzc2VydC5vayhjb21taXRbJ3ByZXZpb3VzQ29tbWl0J10pOworICAg ICAgICB9IGVsc2UgeworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKGNvbW1pdFsncHJldmlvdXND b21taXQnXSwgbnVsbCk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBkZXNjcmliZSgnL2FwaS9j b21taXRzLzxyZXBvc2l0b3J5Pi8nLCAoKSA9PiB7CkBAIC04OCw4ICs5Myw5IEBAIGRlc2NyaWJl KCIvYXBpL2NvbW1pdHMvIiwgKCkgPT4gewogICAgICAgICAgICAgICAgIGFzc2VydENvbW1pdElz U2FtZUFzT25lU3VibWl0dGVkKGNvbW1pdHNbMF0sIHN1Ym1pdHRlZENvbW1pdHNbMF0pOwogICAg ICAgICAgICAgICAgIGFzc2VydENvbW1pdElzU2FtZUFzT25lU3VibWl0dGVkKGNvbW1pdHNbMV0s IHN1Ym1pdHRlZENvbW1pdHNbMV0pOwogICAgICAgICAgICAgICAgIGFzc2VydENvbW1pdElzU2Ft ZUFzT25lU3VibWl0dGVkKGNvbW1pdHNbMl0sIHN1Ym1pdHRlZENvbW1pdHNbMl0pOworICAgICAg ICAgICAgICAgIGFzc2VydC5lcXVhbChjb21taXRzWzJdWydwcmV2aW91c0NvbW1pdCddLCBjb21t aXRzWzFdWydpZCddKTsKICAgICAgICAgICAgIH0pOwotICAgICAgICB9KTsgICAgICAgIAorICAg ICAgICB9KTsKICAgICB9KTsKIAogICAgIGRlc2NyaWJlKCcvYXBpL2NvbW1pdHMvPHJlcG9zaXRv cnk+L29sZGVzdCcsICgpID0+IHsKQEAgLTIzMCw3ICsyMzYsNyBAQCBkZXNjcmliZSgiL2FwaS9j b21taXRzLyIsICgpID0+IHsKICAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVzdWx0Wydz dGF0dXMnXSwgJ09LJyk7CiAgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlc3VsdFsnY29t bWl0cyddLmxlbmd0aCwgMSk7CiAgICAgICAgICAgICAgICAgYXNzZXJ0Q29tbWl0SXNTYW1lQXNP bmVTdWJtaXR0ZWQocmVzdWx0Wydjb21taXRzJ11bMF0sIHsKLSAgICAgICAgICAgICAgICAgICAg cGFyZW50OiBudWxsLAorICAgICAgICAgICAgICAgICAgICBwcmV2aW91c0NvbW1pdDogbnVsbCwK ICAgICAgICAgICAgICAgICAgICAgcmV2aXNpb246ICcyMTA5NTAnLAogICAgICAgICAgICAgICAg ICAgICB0aW1lOiAnMjAxNy0wMS0yMFQwMzo0OTozNy44ODdaJywKICAgICAgICAgICAgICAgICAg ICAgYXV0aG9yOiB7bmFtZTogbnVsbCwgYWNjb3VudDogbnVsbH0sCkBAIC0yOTksMTQgKzMwNSwx NCBAQCBkZXNjcmliZSgiL2FwaS9jb21taXRzLyIsICgpID0+IHsKICAgICAgICAgICAgICAgICBh c3NlcnQuZXF1YWwocmVzdWx0WydzdGF0dXMnXSwgJ09LJyk7CiAgICAgICAgICAgICAgICAgYXNz ZXJ0LmRlZXBFcXVhbChyZXN1bHRbJ2NvbW1pdHMnXS5sZW5ndGgsIDIpOwogICAgICAgICAgICAg ICAgIGFzc2VydENvbW1pdElzU2FtZUFzT25lU3VibWl0dGVkKHJlc3VsdFsnY29tbWl0cyddWzBd LCB7Ci0gICAgICAgICAgICAgICAgICAgIHBhcmVudDogbnVsbCwKKyAgICAgICAgICAgICAgICAg ICAgcHJldmlvdXNDb21taXQ6IG51bGwsCiAgICAgICAgICAgICAgICAgICAgIHJldmlzaW9uOiAn MjEwOTQ5JywKICAgICAgICAgICAgICAgICAgICAgdGltZTogJzIwMTctMDEtMjBUMDM6MjM6NTAu NjQ1WicsCiAgICAgICAgICAgICAgICAgICAgIGF1dGhvcjoge25hbWU6IG51bGwsIGFjY291bnQ6 IG51bGx9LAogICAgICAgICAgICAgICAgICAgICBtZXNzYWdlOiBudWxsLAogICAgICAgICAgICAg ICAgIH0pOwogICAgICAgICAgICAgICAgIGFzc2VydENvbW1pdElzU2FtZUFzT25lU3VibWl0dGVk KHJlc3VsdFsnY29tbWl0cyddWzFdLCB7Ci0gICAgICAgICAgICAgICAgICAgIHBhcmVudDogbnVs bCwKKyAgICAgICAgICAgICAgICAgICAgcHJldmlvdXNDb21taXQ6IG51bGwsCiAgICAgICAgICAg ICAgICAgICAgIHJldmlzaW9uOiAnMjEwOTUwJywKICAgICAgICAgICAgICAgICAgICAgdGltZTog JzIwMTctMDEtMjBUMDM6NDk6MzcuODg3WicsCiAgICAgICAgICAgICAgICAgICAgIGF1dGhvcjog e25hbWU6IG51bGwsIGFjY291bnQ6IG51bGx9LApkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL3NlcnZlci10ZXN0cy9hcGktcmVwb3J0LWNvbW1pdHMtdGVzdHMuanMgYi9XZWJz aXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL2FwaS1yZXBvcnQtY29tbWl0cy10ZXN0 cy5qcwppbmRleCBiYzA3ODE3NGFiMmRiZTliYTk5YjhmZjA0ODA4NWQ5NmUzNTZmMmVjLi45M2Qx YWQ5ZmFhMzNkZmE0MjI4MjVlY2QzMDUxYTM3OTA0YTAzNjhhIDEwMDY0NAotLS0gYS9XZWJzaXRl cy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL2FwaS1yZXBvcnQtY29tbWl0cy10ZXN0cy5q cworKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL2FwaS1yZXBvcnQt Y29tbWl0cy10ZXN0cy5qcwpAQCAtNTQsMTMgKzU0LDI4IEBAIGRlc2NyaWJlKCIvYXBpL3JlcG9y dC1jb21taXRzLyIsIGZ1bmN0aW9uICgpIHsKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7 CiAgICAgICAgICAgICAgICAgInJlcG9zaXRvcnkiOiAiV2ViS2l0IiwKLSAgICAgICAgICAgICAg ICAicGFyZW50IjogIjE0MTk3NyIsCisgICAgICAgICAgICAgICAgInByZXZpb3VzQ29tbWl0Ijog IjE0MTk3NyIsCiAgICAgICAgICAgICAgICAgInJldmlzaW9uIjogIjE0MTk3OCIsCiAgICAgICAg ICAgICAgICAgInRpbWUiOiAiMjAxMy0wMi0wNlQwOTo1NDo1Ni4wWiIsCiAgICAgICAgICAgICAg ICAgImF1dGhvciI6IHsibmFtZSI6ICJNaWtoYWlsIFBvemRueWFrb3YiLCAiYWNjb3VudCI6ICJt aWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tIn0sCiAgICAgICAgICAgICAgICAgIm1lc3NhZ2Ui OiAiYW5vdGhlciBtZXNzYWdlIiwKICAgICAgICAgICAgIH0KICAgICAgICAgXQorICAgIH07CisK KyAgICBjb25zdCBzdWJ2ZXJzaW9uSW52YWxpZFByZXZpb3VzQ29tbWl0ID0geworICAgICAgICAi c2xhdmVOYW1lIjogInNvbWVTbGF2ZSIsCisgICAgICAgICJzbGF2ZVBhc3N3b3JkIjogInNvbWVQ YXNzd29yZCIsCisgICAgICAgICJjb21taXRzIjogWworICAgICAgICAgICAgeworICAgICAgICAg ICAgICAgICJyZXBvc2l0b3J5IjogIldlYktpdCIsCisgICAgICAgICAgICAgICAgInByZXZpb3Vz Q29tbWl0IjogIjk5OTk5IiwKKyAgICAgICAgICAgICAgICAicmV2aXNpb24iOiAiMTIzNDUiLAor ICAgICAgICAgICAgICAgICJ0aW1lIjogIjIwMTMtMDItMDZUMDg6NTU6MjAuOVoiLAorICAgICAg ICAgICAgICAgICJhdXRob3IiOiB7Im5hbWUiOiAiQ29tbWl0IFF1ZXVlIiwgImFjY291bnQiOiAi Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmcifSwKKyAgICAgICAgICAgICAgICAibWVzc2FnZSI6ICJz b21lIG1lc3NhZ2UiLAorICAgICAgICAgICAgfQorICAgICAgICBdCiAgICAgfQogCiAgICAgaXQo InNob3VsZCByZWplY3QgZXJyb3Igd2hlbiBzbGF2ZSBuYW1lIGlzIG1pc3NpbmciLCBmdW5jdGlv biAoZG9uZSkgewpAQCAtMTU4LDYgKzE3Myw3IEBAIGRlc2NyaWJlKCIvYXBpL3JlcG9ydC1jb21t aXRzLyIsIGZ1bmN0aW9uICgpIHsKICAgICAgICAgICAgIGFzc2VydC5lcXVhbChjb21taXRzWzBd Wyd0aW1lJ10udG9TdHJpbmcoKSwgbmV3IERhdGUoJzIwMTMtMDItMDYgMDg6NTU6MjAuOScpLnRv U3RyaW5nKCkpOwogICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKGNvbW1pdHNbMF1bJ21lc3NhZ2Un XSwgcmVwb3J0ZWREYXRhWydtZXNzYWdlJ10pOwogICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKGNv bW1pdHNbMF1bJ2NvbW1pdHRlciddLCBjb21taXR0ZXJzWzBdWydpZCddKTsKKyAgICAgICAgICAg IGFzc2VydC5lcXVhbChjb21taXRzWzBdWydwcmV2aW91c19jb21taXQnXSwgbnVsbCk7CiAgICAg ICAgICAgICBhc3NlcnQuZXF1YWwoY29tbWl0dGVyc1swXVsnbmFtZSddLCByZXBvcnRlZERhdGFb J2F1dGhvciddWyduYW1lJ10pOwogICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKGNvbW1pdHRlcnNb MF1bJ2FjY291bnQnXSwgcmVwb3J0ZWREYXRhWydhdXRob3InXVsnYWNjb3VudCddKTsKIApAQCAt MTY2LDYgKzE4Miw3IEBAIGRlc2NyaWJlKCIvYXBpL3JlcG9ydC1jb21taXRzLyIsIGZ1bmN0aW9u ICgpIHsKICAgICAgICAgICAgIGFzc2VydC5lcXVhbChjb21taXRzWzFdWyd0aW1lJ10udG9TdHJp bmcoKSwgbmV3IERhdGUoJzIwMTMtMDItMDYgMDk6NTQ6NTYuMCcpLnRvU3RyaW5nKCkpOwogICAg ICAgICAgICAgYXNzZXJ0LmVxdWFsKGNvbW1pdHNbMV1bJ21lc3NhZ2UnXSwgcmVwb3J0ZWREYXRh WydtZXNzYWdlJ10pOwogICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKGNvbW1pdHNbMV1bJ2NvbW1p dHRlciddLCBjb21taXR0ZXJzWzFdWydpZCddKTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChj b21taXRzWzFdWydwcmV2aW91c19jb21taXQnXSwgY29tbWl0c1swXVsnaWQnXSk7CiAgICAgICAg ICAgICBhc3NlcnQuZXF1YWwoY29tbWl0dGVyc1sxXVsnbmFtZSddLCByZXBvcnRlZERhdGFbJ2F1 dGhvciddWyduYW1lJ10pOwogICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKGNvbW1pdHRlcnNbMV1b J2FjY291bnQnXSwgcmVwb3J0ZWREYXRhWydhdXRob3InXVsnYWNjb3VudCddKTsKIApAQCAtMTcz LDYgKzE5MCwxOSBAQCBkZXNjcmliZSgiL2FwaS9yZXBvcnQtY29tbWl0cy8iLCBmdW5jdGlvbiAo KSB7CiAgICAgICAgIH0pLmNhdGNoKGRvbmUpOwogICAgIH0pOwogCisgICAgaXQoInNob3VsZCBm YWlsIGlmIHByZXZpb3VzIGNvbW1pdCBpcyBpbnZhbGlkIiwgZnVuY3Rpb24gKGRvbmUpIHsKKyAg ICAgICAgY29uc3QgZGIgPSBUZXN0U2VydmVyLmRhdGFiYXNlKCk7CisgICAgICAgIGFkZFNsYXZl Rm9yUmVwb3J0KHN1YnZlcnNpb25JbnZhbGlkUHJldmlvdXNDb21taXQpLnRoZW4oZnVuY3Rpb24g KCkgeworICAgICAgICAgICAgcmV0dXJuIFRlc3RTZXJ2ZXIucmVtb3RlQVBJKCkucG9zdEpTT04o Jy9hcGkvcmVwb3J0LWNvbW1pdHMvJywgc3VidmVyc2lvbkludmFsaWRQcmV2aW91c0NvbW1pdCk7 CisgICAgICAgIH0pLnRoZW4oZnVuY3Rpb24gKHJlc3BvbnNlKSB7CisgICAgICAgICAgICBhc3Nl cnQuZXF1YWwocmVzcG9uc2VbJ3N0YXR1cyddLCAnRmFpbGVkVG9GaW5kUHJldmlvdXNDb21taXQn KTsKKyAgICAgICAgICAgIHJldHVybiBkYi5zZWxlY3RBbGwoJ2NvbW1pdHMnKTsKKyAgICAgICAg fSkudGhlbihmdW5jdGlvbiAocmVzdWx0KSB7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVz dWx0Lmxlbmd0aCwgMCk7CisgICAgICAgICAgICBkb25lKCk7CisgICAgICAgIH0pLmNhdGNoKGRv bmUpOworICAgIH0pOworCiAgICAgaXQoInNob3VsZCB1cGRhdGUgYW4gZXhpc3RpbmcgY29tbWl0 IGlmIHRoZXJlIGlzIG9uZSIsIGZ1bmN0aW9uIChkb25lKSB7CiAgICAgICAgIGNvbnN0IGRiID0g VGVzdFNlcnZlci5kYXRhYmFzZSgpOwogICAgICAgICBjb25zdCByZXBvcnRlZERhdGEgPSBzdWJ2 ZXJzaW9uQ29tbWl0LmNvbW1pdHNbMF07CkBAIC0yMjcsNyArMjU3LDcgQEAgZGVzY3JpYmUoIi9h cGkvcmVwb3J0LWNvbW1pdHMvIiwgZnVuY3Rpb24gKCkgewogICAgICAgICAgICAgYXNzZXJ0LmVx dWFsKGNvbW1pdHNbMF1bJ2NvbW1pdHRlciddLCBjb21taXR0ZXJzWzBdWydpZCddKTsKICAgICAg ICAgICAgIGFzc2VydC5lcXVhbChjb21taXR0ZXJzWzBdWyduYW1lJ10sIGZpcnN0RGF0YVsnYXV0 aG9yJ11bJ25hbWUnXSk7CiAgICAgICAgICAgICBhc3NlcnQuZXF1YWwoY29tbWl0dGVyc1swXVsn YWNjb3VudCddLCBmaXJzdERhdGFbJ2F1dGhvciddWydhY2NvdW50J10pOwotICAgICAgICAgICAg CisKICAgICAgICAgICAgIGFzc2VydC5lcXVhbChjb21taXRzWzFdWydpZCddLCAzKTsKICAgICAg ICAgICAgIGFzc2VydC5lcXVhbChjb21taXRzWzFdWydtZXNzYWdlJ10sIG51bGwpOwogICAgICAg ICAgICAgYXNzZXJ0LmVxdWFsKGNvbW1pdHNbMV1bJ2NvbW1pdHRlciddLCBudWxsKTsKZGlmZiAt LWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9zeW5jLWNvbW1pdHMucHkgYi9X ZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvc3luYy1jb21taXRzLnB5CmluZGV4IDViNWRl ZDA0MmZmMmFmZGJjNzdmYjBiZDliMDM2NTc4ZTk3MmRjMTAuLmE5NmVhMjNkM2RmNDg5OTI1ODE4 MTM1NmQ5N2JhOTcwMmZlZjE1NGIgMTAwNzU1Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9y Zy90b29scy9zeW5jLWNvbW1pdHMucHkKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rv b2xzL3N5bmMtY29tbWl0cy5weQpAQCAtMjMsNyArMjMsNyBAQCBkZWYgbWFpbihhcmd2KToKICAg ICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLXNlcnZlci1jb25maWctanNvbicsIHJlcXVpcmVkPVRy dWUsIGhlbHA9J1RoZSBwYXRoIHRvIGEgSlNPTiBmaWxlIHRoYXQgc3BlY2lmaWVzIHRoZSBwZXJm IGRhc2hib2FyZCcpCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1zZWNvbmRzLXRvLXNsZWVw JywgdHlwZT1mbG9hdCwgZGVmYXVsdD05MDAsIGhlbHA9J1RoZSBzZWNvbmRzIHRvIHNsZWVwIGJl dHdlZW4gaXRlcmF0aW9ucycpCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1tYXgtZmV0Y2gt Y291bnQnLCB0eXBlPWludCwgZGVmYXVsdD0xMCwgaGVscD0nVGhlIG51bWJlciBvZiBjb21taXRz IHRvIGZldGNoIGF0IG9uY2UnKQotICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy0tbWF4LWFuY2Vz dG9yLWZldGNoLWNvdW50JywgdHlwZT1pbnQsIGRlZmF1bHQ9MTAwLCBoZWxwPSdUaGUgbnVtYmVy IG9mIGNvbW1pdHMgdG8gZmV0Y2ggYXQgb25jZSBpZiBzb21lIGNvbW1pdHMgYXJlIG1pc3Npbmcg cGFyZW50cycpCisgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1tYXgtYW5jZXN0b3ItZmV0Y2gt Y291bnQnLCB0eXBlPWludCwgZGVmYXVsdD0xMDAsIGhlbHA9J1RoZSBudW1iZXIgb2YgY29tbWl0 cyB0byBmZXRjaCBhdCBvbmNlIGlmIHNvbWUgY29tbWl0cyBhcmUgbWlzc2luZyBwcmV2aW91cyBj b21taXRzJykKICAgICBhcmdzID0gcGFyc2VyLnBhcnNlX2FyZ3MoKQogCiAgICAgd2l0aCBvcGVu KGFyZ3MucmVwb3NpdG9yeV9jb25maWdfanNvbikgYXMgcmVwb3NpdG9yeV9jb25maWdfanNvbjoK QEAgLTc5LDE2ICs3OSwxNiBAQCBjbGFzcyBSZXBvc2l0b3J5KG9iamVjdCk6CiAgICAgICAgICAg ICBwcmludCAiU3VibWl0dGluZyByZXZpc2lvbnMgJXMgZm9yICVzIHRvICVzIiAlIChyZXZpc2lv bl9saXN0LCBzZWxmLl9uYW1lLCBzZXJ2ZXJfY29uZmlnWydzZXJ2ZXInXVsndXJsJ10pCiAKICAg ICAgICAgICAgIHJlc3VsdCA9IHN1Ym1pdF9jb21taXRzKHBlbmRpbmdfY29tbWl0cywgc2VydmVy X2NvbmZpZ1snc2VydmVyJ11bJ3VybCddLAotICAgICAgICAgICAgICAgIHNlcnZlcl9jb25maWdb J3NsYXZlJ11bJ25hbWUnXSwgc2VydmVyX2NvbmZpZ1snc2xhdmUnXVsncGFzc3dvcmQnXSwgWydP SycsICdGYWlsZWRUb0ZpbmRQYXJlbnRDb21taXQnXSkKKyAgICAgICAgICAgICAgICBzZXJ2ZXJf Y29uZmlnWydzbGF2ZSddWyduYW1lJ10sIHNlcnZlcl9jb25maWdbJ3NsYXZlJ11bJ3Bhc3N3b3Jk J10sIFsnT0snLCAnRmFpbGVkVG9GaW5kUHJldmlvdXNDb21taXQnXSkKIAogICAgICAgICAgICAg aWYgcmVzdWx0LmdldCgnc3RhdHVzJykgPT0gJ09LJzoKICAgICAgICAgICAgICAgICBicmVhawog Ci0gICAgICAgICAgICBpZiByZXN1bHQuZ2V0KCdzdGF0dXMnKSA9PSAnRmFpbGVkVG9GaW5kUGFy ZW50Q29tbWl0JzoKLSAgICAgICAgICAgICAgICBwYXJlbnRfY29tbWl0ID0gc2VsZi5mZXRjaF9j b21taXQoc2VydmVyX2NvbmZpZywgcmVzdWx0Wydjb21taXQnXVsncGFyZW50J10pCi0gICAgICAg ICAgICAgICAgaWYgbm90IHBhcmVudF9jb21taXQ6Ci0gICAgICAgICAgICAgICAgICAgIHJhaXNl IEV4Y2VwdGlvbignQ291bGQgbm90IGZpbmQgdGhlIHBhcmVudCAlcyBvZiAlcycgJSAocmVzdWx0 Wydjb21taXQnXVsncGFyZW50J10sIHJlc3VsdFsnY29tbWl0J11bJ3JldmlzaW9uJ10pKQotICAg ICAgICAgICAgICAgIHBlbmRpbmdfY29tbWl0cyA9IFtwYXJlbnRfY29tbWl0XSArIHBlbmRpbmdf Y29tbWl0cworICAgICAgICAgICAgaWYgcmVzdWx0LmdldCgnc3RhdHVzJykgPT0gJ0ZhaWxlZFRv RmluZFByZXZpb3VzQ29tbWl0JzoKKyAgICAgICAgICAgICAgICBwcmV2aW91c19jb21taXQgPSBz ZWxmLmZldGNoX2NvbW1pdChzZXJ2ZXJfY29uZmlnLCByZXN1bHRbJ2NvbW1pdCddWydwcmV2aW91 c0NvbW1pdCddKQorICAgICAgICAgICAgICAgIGlmIG5vdCBwcmV2aW91c19jb21taXQ6CisgICAg ICAgICAgICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbignQ291bGQgbm90IGZpbmQgdGhlIHByZXZp b3VzIGNvbW1pdCAlcyBvZiAlcycgJSAocmVzdWx0Wydjb21taXQnXVsncHJldmlvdXNDb21taXQn XSwgcmVzdWx0Wydjb21taXQnXVsncmV2aXNpb24nXSkpCisgICAgICAgICAgICAgICAgcGVuZGlu Z19jb21taXRzID0gW3ByZXZpb3VzX2NvbW1pdF0gKyBwZW5kaW5nX2NvbW1pdHMKIAogICAgICAg ICBpZiByZXN1bHQuZ2V0KCdzdGF0dXMnKSAhPSAnT0snOgogICAgICAgICAgICAgcmFpc2UgRXhj ZXB0aW9uKHJlc3VsdCkKQEAgLTIyMyw3ICsyMjMsNyBAQCBjbGFzcyBHaXRSZXBvc2l0b3J5KFJl cG9zaXRvcnkpOgogICAgICAgICBjdXJyZW50X2hhc2ggPSB0b2tlbnNbMF0KICAgICAgICAgY29t bWl0X3RpbWUgPSBpbnQodG9rZW5zWzFdKQogICAgICAgICBhdXRob3JfZW1haWwgPSB0b2tlbnNb Ml0KLSAgICAgICAgcGFyZW50X2hhc2ggPSB0b2tlbnNbM10gaWYgbGVuKHRva2VucykgPj0gNCBl bHNlIE5vbmUKKyAgICAgICAgcHJldmlvdXNfaGFzaCA9IHRva2Vuc1szXSBpZiBsZW4odG9rZW5z KSA+PSA0IGVsc2UgTm9uZQogCiAgICAgICAgIGF1dGhvcl9uYW1lID0gc2VsZi5fcnVuX2dpdF9j b21tYW5kKFsnbG9nJywgY3VycmVudF9oYXNoLCAnLTEnLCAnLS1wcmV0dHk9JWNuJ10pCiAgICAg ICAgIG1lc3NhZ2UgPSBzZWxmLl9ydW5fZ2l0X2NvbW1hbmQoWydsb2cnLCBjdXJyZW50X2hhc2gs ICctMScsICctLXByZXR0eT0lQiddKQpAQCAtMjMxLDcgKzIzMSw3IEBAIGNsYXNzIEdpdFJlcG9z aXRvcnkoUmVwb3NpdG9yeSk6CiAgICAgICAgIHJldHVybiB7CiAgICAgICAgICAgICAncmVwb3Np dG9yeSc6IHNlbGYuX25hbWUsCiAgICAgICAgICAgICAncmV2aXNpb24nOiBjdXJyZW50X2hhc2gs Ci0gICAgICAgICAgICAncGFyZW50JzogcGFyZW50X2hhc2gsCisgICAgICAgICAgICAncHJldmlv dXNDb21taXQnOiBwcmV2aW91c19oYXNoLAogICAgICAgICAgICAgJ3RpbWUnOiBkYXRldGltZS5m cm9tdGltZXN0YW1wKGNvbW1pdF90aW1lKS5zdHJmdGltZShyJyVZLSVtLSVkVCVIOiVNOiVTLiVm JyksCiAgICAgICAgICAgICAnYXV0aG9yJzogeydhY2NvdW50JzogYXV0aG9yX2VtYWlsLCAnbmFt ZSc6IGF1dGhvcl9uYW1lfSwKICAgICAgICAgICAgICdtZXNzYWdlJzogbWVzc2FnZSwKZGlmZiAt LWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRlc3RzL2FuYWx5c2lzLXRhc2st dGVzdHMuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9hbmFseXNpcy10 YXNrLXRlc3RzLmpzCmluZGV4IDNhMzllZmIyZWY1YTljYzM2Mzg0YWFjNzU3NzE1NGYyYjQzMmZk YTUuLjViOTFjYWFmOTQyNzg0ZDc0ZTU3ZWE3YmRmNmE5MThjZGVjYTJjOWEgMTAwNjQ0Ci0tLSBh L1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRlc3RzL2FuYWx5c2lzLXRhc2stdGVzdHMu anMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVzdHMvYW5hbHlzaXMtdGFz ay10ZXN0cy5qcwpAQCAtNDMsNyArNDMsNyBAQCBmdW5jdGlvbiBzYW1wbGVBbmFseXNpc1Rhc2so KQogICAgICAgICAgICAgICAgICdpZCc6ICcxMDU5NzUnLAogICAgICAgICAgICAgICAgICdtZXNz YWdlJzogJ0NvbW1pdCBtZXNzYWdlJywKICAgICAgICAgICAgICAgICAnb3JkZXInOiBudWxsLAot ICAgICAgICAgICAgICAgICdwYXJlbnQnOiBudWxsLAorICAgICAgICAgICAgICAgICdwcmV2aW91 c0NvbW1pdCc6IG51bGwsCiAgICAgICAgICAgICAgICAgJ3JlcG9zaXRvcnknOiAnMTEnLAogICAg ICAgICAgICAgICAgICdyZXZpc2lvbic6ICcxOTYwNTEnLAogICAgICAgICAgICAgICAgICd0aW1l JzogMTQ1NDQ4MTI0NjEwOAo=