147043 2015-07-17 11:28:54 -0700 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. 2015-08-07 15:49:13 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=147796 P2 Normal --- 1 jmarcell jmarcell adele commit-queue dbates jmarcell oldest_to_newest 1110162 0 jmarcell 2015-07-17 11:28:54 -0700 Currently the "_normalizeQueueInfo" method is adding some hardcoded defaults for the queueInfo.branch data structure. I propose that the defaults be specified instead by a Buildbot base class method (which returns an empty dictionary) that can be overridden by inheriting classes. 1110166 1 256978 jmarcell 2015-07-17 11:31:14 -0700 Created attachment 256978 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. 1110168 2 256978 dbates 2015-07-17 11:38:37 -0700 Comment on attachment 256978 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. View in context: https://bugs.webkit.org/attachment.cgi?id=256978&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:98 > + get defaultBranches() { Please move curly brace ('{'} to its own line. See the setter isAuthenticated() (below) for an example. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:78 > + _getDefaultBranches: function() { Ditto. > Tools/ChangeLog:15 > + * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js: > + (Buildbot.prototype._getDefaultBranches): > + base class method to return empty dictionary > + (Buildbot.prototype._normalizeQueueInfo): > + Calls _getDefaultBranches instead of hardcoded values > + * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js: > + (WebKitBuildbot.prototype._getDefaultBranches): > + overrides base class and provides a webkit-specific implementation that only cares about "opensource" This change log entry is out-of-date. Please update it. Also, please write complete sentences that start with a capital letter and end with a period. 1110169 3 256978 dbates 2015-07-17 11:39:34 -0700 Comment on attachment 256978 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. View in context: https://bugs.webkit.org/attachment.cgi?id=256978&action=review >> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:78 >> + _getDefaultBranches: function() { > > Ditto. "_getDefaultBranches: function()" => "get defaultBranches()" 1110213 4 jmarcell 2015-07-17 14:24:27 -0700 Thanks for your feedback, Dan. I'll be sending a new patch soon. However, in my testing I found some assertions which this changes causes to fail, and which seem to contradict our assumption that combined queues should not have a dictionary of branches. This is in the constructor for BuildbotCombinedQueueView BuildbotCombinedQueueView = function(queue) { for (var i = 1, end = queue.combinedQueues.length; i < end; ++i) { console.assert(queue.combinedQueues[0].buildbot === queue.combinedQueues[i].buildbot); console.assert(queue.combinedQueues[0].branch.openSource === queue.combinedQueues[i].branch.openSource); console.assert(queue.combinedQueues[0].branch.internal === queue.combinedQueues[i].branch.internal); } I've just finished looking over the codebase for usages of .branch and I don't see any reason why we need to make this assertion. Do you agree that we should remove these assertions? 1110825 5 257148 jmarcell 2015-07-20 17:05:10 -0700 Created attachment 257148 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. Currently the "_normalizeQueueInfo" method is adding some hardcoded defaults for the queueInfo.branch data structure. I have been working with Dan Bates on a more generic solution in which the defaults may be specified instead by a Buildbot base class getter method (which returns an empty dictionary) that can be overridden by inheriting classes. 1110881 6 257148 ap 2015-07-20 20:21:38 -0700 Comment on attachment 257148 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. View in context: https://bugs.webkit.org/attachment.cgi?id=257148&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:110 > + queueInfo.branch = queueInfo.combinedQueues ? null : queueInfo.branch || this.defaultBranches; Why can't a combined queue be on a branch? We don't have any now, but I don't see any intrinsic reason for this limitation. The operator precedence here seems non-obvious enough that I'd have appreciated parentheses. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js:28 > + var all_branch = {}; "all_branch" is neither named according to WebKit style, nor grammatically correct. 1110964 7 257148 jmarcell 2015-07-21 10:41:52 -0700 Comment on attachment 257148 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. View in context: https://bugs.webkit.org/attachment.cgi?id=257148&action=review >> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:110 >> + queueInfo.branch = queueInfo.combinedQueues ? null : queueInfo.branch || this.defaultBranches; > > Why can't a combined queue be on a branch? We don't have any now, but I don't see any intrinsic reason for this limitation. > > The operator precedence here seems non-obvious enough that I'd have appreciated parentheses. It seems that a combined queue is just a collection of sub-queues and that information pertaining to the repository/branch, etc. of the individual queues would be better kept at the sub-queue level. Especially in the case where the individual sub-queues have different repositories, what would it mean for the containing combined queue to have a repository associated with it? As Dan Bates mentioned to me, the parentheses are not necessary according to this: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Operator_Precedence However, I agree that a set of parentheses might be nice to emphasize which part is evaluated first for someone who does not have this reference handy and does not have the operator precedence memorized. >> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js:28 >> + var all_branch = {}; > > "all_branch" is neither named according to WebKit style, nor grammatically correct. I agree that this is not grammatically correct. This was not my initial choice for variable name, but I wanted to remain consistent with the choice of "branch" on the "BuildbotQueue" object (a data structure that contains repository to branch mappings). Would "all_branches" be a better choice? 1111035 8 257198 jmarcell 2015-07-21 13:26:03 -0700 Created attachment 257198 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. Dan Bates and Alexey Proskuryakov discussed the previous patch and concluded that combined queues should not have a repository/branch mapping associated with them. As such, this has been removed and we now assert that combined queues do not have a repository/branch mapping associated with them. Also, with Dan Bates help, we arrived at a better way of reporting inconsistencies in the repository/branch mapping associations within a combined queue collection. We report the indices of conflicting sub-queues where the conflicting sub-queues have a mapping entry for the same repository but the branch associated with that repository is not the same. 1111093 9 257198 ap 2015-07-21 15:46:35 -0700 Comment on attachment 257198 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. View in context: https://bugs.webkit.org/attachment.cgi?id=257198&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:101 > + get defaultBranches() > + { > + return {}; > + }, Do we need this? Looks like {} is always wrong. 1111102 10 257198 jmarcell 2015-07-21 16:13:22 -0700 Comment on attachment 257198 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. View in context: https://bugs.webkit.org/attachment.cgi?id=257198&action=review >> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:101 >> + }, > > Do we need this? Looks like {} is always wrong. I was just providing a default implementation, but assuming we never instantiate Buildbot, but instead only ever instantiate a subclass of Buildbot, I agree that this is unneeded. I checked and did not see any instance of Buildbot being instantiated and I also tested removing this getter and everything seemed fine. 1111116 11 257217 jmarcell 2015-07-21 16:30:10 -0700 Created attachment 257217 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. Removing base class implementation of defaultBranches getter from "Buildbot" class. Also removed braces from one-line "if" body. 1111143 12 257217 dbates 2015-07-21 17:34:49 -0700 Comment on attachment 257217 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. View in context: https://bugs.webkit.org/attachment.cgi?id=257217&action=review Look good. > Tools/ChangeLog:18 > + Overrides the base class and provides a webkit-specific implementation that sets the queue.branches > + dictionary to have a single entry for "openSource" as the default set of branches. This change log entry is out of date. There is no base class implementation of defaultBranches. Nit: webkit => WebKit 1111152 13 257217 dbates 2015-07-21 17:46:23 -0700 Comment on attachment 257217 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. View in context: https://bugs.webkit.org/attachment.cgi?id=257217&action=review >> Tools/ChangeLog:18 >> + dictionary to have a single entry for "openSource" as the default set of branches. > > This change log entry is out of date. There is no base class implementation of defaultBranches. > > Nit: webkit => WebKit Also, as mentioned in an in-person discussion with Jason today, I suggest that we add a remark to the change log entry that explains that we intentionally omitted a base class implementation of the defaultBranches getter so as to cause a JavaScript TypeError when a sub-queue of a combined queue does not specify property branch and the derived Buildbot class does not implement defaultBranches so that a person can either update the definition of the sub-queue or implement defaultBranches in the derived Builedbot class they are using. 1111154 14 jmarcell 2015-07-21 17:51:31 -0700 (In reply to comment #0) > Currently the "_normalizeQueueInfo" method is adding some hardcoded defaults > for the queueInfo.branch data structure. I propose that the defaults be > specified instead by a Buildbot base class method (which returns an empty > dictionary) that can be overridden by inheriting classes. To clarify, Dan Bates made this proposal. Also, since the time of writing we have since removed the base class getter and now subclasses are required to provide their own implementation. 1111163 15 257228 jmarcell 2015-07-21 18:01:37 -0700 Created attachment 257228 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. Updating review info and ChangeLog comments. 1111186 16 257228 dbates 2015-07-21 19:00:41 -0700 Comment on attachment 257228 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. We need to update the internal buildbot configuration before landing this patch. 1111209 17 jmarcell 2015-07-21 22:09:14 -0700 I submitted a PFR for that. 1111372 18 257228 commit-queue 2015-07-22 12:01:59 -0700 Comment on attachment 257228 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. Clearing flags on attachment: 257228 Committed r187172: <http://trac.webkit.org/changeset/187172> 1111373 19 commit-queue 2015-07-22 12:02:03 -0700 All reviewed patches have been landed. Closing bug. 256978 2015-07-17 11:31:14 -0700 2015-07-20 17:05:10 -0700 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. 0001-Remove-hardcoded-internal-from-Buildbot.prototype._n.patch text/plain 3787 jmarcell RnJvbSBiNDY5NDdkMzY5M2EwMDNlMzI1ZDE1NWRmZDdlZmE2NDBjZTNlYmViIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYXNvbiBNYXJjZWxsIDxqbWFyY2VsbEBhcHBsZS5jb20+CkRh dGU6IFRodSwgMTYgSnVsIDIwMTUgMTY6NDc6MDEgLTA3MDAKU3ViamVjdDogW1BBVENIXSBSZW1v dmUgaGFyZGNvZGVkICJpbnRlcm5hbCIgZnJvbQogQnVpbGRib3QucHJvdG90eXBlLl9ub3JtYWxp emVRdWV1ZUluZm8uCgotLS0KIC4uLi9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWls ZGJvdC5qcyAgICAgICAgICAgIHwgIDYgKysrKystCiAuLi4vcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvV2ViS2l0QnVpbGRib3QuanMgICAgICB8ICA0ICsrKysKIFRvb2xzL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMTYgKysrKysrKysr KysrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCAyNSBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0p CgpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1j b25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3QuanMgYi9Ub29scy9C dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNo Ym9hcmQvU2NyaXB0cy9CdWlsZGJvdC5qcwppbmRleCA4NTU2MjRjLi45YjBlOGViIDEwMDY0NAot LS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJs aWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdC5qcworKysgYi9Ub29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQv U2NyaXB0cy9CdWlsZGJvdC5qcwpAQCAtOTUsNiArOTUsMTAgQEAgQnVpbGRib3QucHJvdG90eXBl ID0gewogICAgICAgICByZXR1cm4gdGhpcy5fYXV0aGVudGljYXRpb25TdGF0dXMgPT09IEJ1aWxk Ym90LkF1dGhlbnRpY2F0aW9uU3RhdHVzLkF1dGhlbnRpY2F0ZWQ7CiAgICAgfSwKIAorICAgIGdl dCBkZWZhdWx0QnJhbmNoZXMoKSB7CisgICAgICAgIHJldHVybiB7fTsKKyAgICB9LAorCiAgICAg c2V0IGlzQXV0aGVudGljYXRlZCh2YWx1ZSkKICAgICB7CiAgICAgICAgIHRoaXMuX2F1dGhlbnRp Y2F0aW9uU3RhdHVzID0gdmFsdWUgPyBCdWlsZGJvdC5BdXRoZW50aWNhdGlvblN0YXR1cy5BdXRo ZW50aWNhdGVkIDogQnVpbGRib3QuQXV0aGVudGljYXRpb25TdGF0dXMuSW52YWxpZENyZWRlbnRp YWxzOwpAQCAtMTAyLDcgKzEwNiw3IEBAIEJ1aWxkYm90LnByb3RvdHlwZSA9IHsKIAogICAgIF9u b3JtYWxpemVRdWV1ZUluZm86IGZ1bmN0aW9uKHF1ZXVlSW5mbykKICAgICB7Ci0gICAgICAgIHF1 ZXVlSW5mby5icmFuY2ggPSBxdWV1ZUluZm8uYnJhbmNoIHx8IHsgb3BlblNvdXJjZTogInRydW5r IiwgaW50ZXJuYWw6ICJ0cnVuayIgfTsKKyAgICAgICAgcXVldWVJbmZvLmJyYW5jaCA9IHF1ZXVl SW5mby5jb21iaW5lZFF1ZXVlcyA/ICBudWxsIDogcXVldWVJbmZvLmJyYW5jaCB8fCB0aGlzLmRl ZmF1bHRCcmFuY2hlczsKICAgICAgICAgcXVldWVJbmZvLmRlYnVnID0gcXVldWVJbmZvLmRlYnVn IHx8IGZhbHNlOwogICAgICAgICBxdWV1ZUluZm8uYnVpbGRlciA9IHF1ZXVlSW5mby5idWlsZGVy IHx8IGZhbHNlOwogICAgICAgICBxdWV1ZUluZm8udGVzdGVyID0gcXVldWVJbmZvLnRlc3RlciB8 fCBmYWxzZTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1dlYktpdEJ1aWxkYm90 LmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVi bGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvV2ViS2l0QnVpbGRib3QuanMKaW5kZXggNTJmMWMw My4uYzAyZmU4YyAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Vi a2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvV2ViS2l0QnVpbGRi b3QuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvV2ViS2l0QnVpbGRib3QuanMKQEAgLTc1 LDYgKzc1LDEwIEBAIFdlYktpdEJ1aWxkYm90LnByb3RvdHlwZSA9IHsKICAgICBfX3Byb3RvX186 IEJ1aWxkYm90LnByb3RvdHlwZSwKICAgICBwZXJmb3JtYW5jZURhc2hib2FyZFVSTDogICJodHRw czovL3BlcmYud2Via2l0Lm9yZyIsCiAKKyAgICBfZ2V0RGVmYXVsdEJyYW5jaGVzOiBmdW5jdGlv bigpIHsKKyAgICAgICAgcmV0dXJuIHsgb3BlblNvdXJjZTogInRydW5rIiB9OworICAgIH0sCisK ICAgICBsYXlvdXRUZXN0UmVzdWx0c0RpcmVjdG9yeVVSTEZvckl0ZXJhdGlvbjogZnVuY3Rpb24o aXRlcmF0aW9uKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuYmFzZVVSTCArICJyZXN1bHRz LyIgKyBlbmNvZGVVUklDb21wb25lbnQoaXRlcmF0aW9uLnF1ZXVlLmlkKSArICIvIiArIGVuY29k ZVVSSUNvbXBvbmVudCgiciIgKyBpdGVyYXRpb24ub3BlblNvdXJjZVJldmlzaW9uICsgIiAoIiAr IGl0ZXJhdGlvbi5pZCArICIpIik7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggOTYxYjRmZi4uZDBhOTU4YyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hh bmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA3LTE2 ICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBo YXJkY29kZWQgImludGVybmFsIiBmcm9tIEJ1aWxkYm90LnByb3RvdHlwZS5fbm9ybWFsaXplUXVl dWVJbmZvLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ3MDQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9k YXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdC5qczoKKyAgICAgICAgKEJ1aWxkYm90LnByb3RvdHlw ZS5fZ2V0RGVmYXVsdEJyYW5jaGVzKToKKyAgICAgICAgYmFzZSBjbGFzcyBtZXRob2QgdG8gcmV0 dXJuIGVtcHR5IGRpY3Rpb25hcnkKKyAgICAgICAgKEJ1aWxkYm90LnByb3RvdHlwZS5fbm9ybWFs aXplUXVldWVJbmZvKToKKyAgICAgICAgQ2FsbHMgX2dldERlZmF1bHRCcmFuY2hlcyBpbnN0ZWFk IG9mIGhhcmRjb2RlZCB2YWx1ZXMKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9XZWJLaXRCdWls ZGJvdC5qczoKKyAgICAgICAgKFdlYktpdEJ1aWxkYm90LnByb3RvdHlwZS5fZ2V0RGVmYXVsdEJy YW5jaGVzKToKKyAgICAgICAgb3ZlcnJpZGVzIGJhc2UgY2xhc3MgYW5kIHByb3ZpZGVzIGEgd2Vi a2l0LXNwZWNpZmljIGltcGxlbWVudGF0aW9uIHRoYXQgb25seSBjYXJlcyBhYm91dCAib3BlbnNv dXJjZSIKKwogMjAxNS0wNy0xNiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNv bT4KIAogICAgICAgICBBZGRlZCBteXNlbGYgdG8gdGhlIGxpc3Qgb2YgY29udHJpYnV0b3JzLgot LSAKMi4zLjggKEFwcGxlIEdpdC01OCkKCg== 257148 2015-07-20 17:05:10 -0700 2015-07-21 13:26:03 -0700 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. 0001-Remove-hardcoded-internal-from-Buildbot.prototype._n.patch text/plain 5859 jmarcell RnJvbSBkODYyZmI5OTU1NjNjMmZiNjhkNjJkYWNkN2YwNzhiYTUwMWQxNWFhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYXNvbiBNYXJjZWxsIDxqbWFyY2VsbEBhcHBsZS5jb20+CkRh dGU6IE1vbiwgMjAgSnVsIDIwMTUgMTY6NTk6MjYgLTA3MDAKU3ViamVjdDogW1BBVENIXSBSZW1v dmUgaGFyZGNvZGVkICJpbnRlcm5hbCIgZnJvbQogQnVpbGRib3QucHJvdG90eXBlLl9ub3JtYWxp emVRdWV1ZUluZm8uCgotLS0KIC4uLi9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWls ZGJvdC5qcyAgICAgICB8ICA3ICsrKysrKy0KIC4uLi9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJv dENvbWJpbmVkUXVldWVWaWV3LmpzICB8IDEzICsrKysrKysrKystLS0KIC4uLi9wdWJsaWNfaHRt bC9kYXNoYm9hcmQvU2NyaXB0cy9XZWJLaXRCdWlsZGJvdC5qcyB8ICA1ICsrKysrCiBUb29scy9D aGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAyMSArKysrKysr KysrKysrKysrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgNDIgaW5zZXJ0aW9ucygrKSwgNCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdC5qcyBi L1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19o dG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90LmpzCmluZGV4IDg1NTYyNGMuLmYwMDg1NDYg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90LmpzCisrKyBiL1Rvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rh c2hib2FyZC9TY3JpcHRzL0J1aWxkYm90LmpzCkBAIC05NSw2ICs5NSwxMSBAQCBCdWlsZGJvdC5w cm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9hdXRoZW50aWNhdGlvblN0YXR1cyA9 PT0gQnVpbGRib3QuQXV0aGVudGljYXRpb25TdGF0dXMuQXV0aGVudGljYXRlZDsKICAgICB9LAog CisgICAgZ2V0IGRlZmF1bHRCcmFuY2hlcygpCisgICAgeworICAgICAgICByZXR1cm4ge307Cisg ICAgfSwKKwogICAgIHNldCBpc0F1dGhlbnRpY2F0ZWQodmFsdWUpCiAgICAgewogICAgICAgICB0 aGlzLl9hdXRoZW50aWNhdGlvblN0YXR1cyA9IHZhbHVlID8gQnVpbGRib3QuQXV0aGVudGljYXRp b25TdGF0dXMuQXV0aGVudGljYXRlZCA6IEJ1aWxkYm90LkF1dGhlbnRpY2F0aW9uU3RhdHVzLklu dmFsaWRDcmVkZW50aWFsczsKQEAgLTEwMiw3ICsxMDcsNyBAQCBCdWlsZGJvdC5wcm90b3R5cGUg PSB7CiAKICAgICBfbm9ybWFsaXplUXVldWVJbmZvOiBmdW5jdGlvbihxdWV1ZUluZm8pCiAgICAg ewotICAgICAgICBxdWV1ZUluZm8uYnJhbmNoID0gcXVldWVJbmZvLmJyYW5jaCB8fCB7IG9wZW5T b3VyY2U6ICJ0cnVuayIsIGludGVybmFsOiAidHJ1bmsiIH07CisgICAgICAgIHF1ZXVlSW5mby5i cmFuY2ggPSBxdWV1ZUluZm8uY29tYmluZWRRdWV1ZXMgPyAgbnVsbCA6IHF1ZXVlSW5mby5icmFu Y2ggfHwgdGhpcy5kZWZhdWx0QnJhbmNoZXM7CiAgICAgICAgIHF1ZXVlSW5mby5kZWJ1ZyA9IHF1 ZXVlSW5mby5kZWJ1ZyB8fCBmYWxzZTsKICAgICAgICAgcXVldWVJbmZvLmJ1aWxkZXIgPSBxdWV1 ZUluZm8uYnVpbGRlciB8fCBmYWxzZTsKICAgICAgICAgcXVldWVJbmZvLnRlc3RlciA9IHF1ZXVl SW5mby50ZXN0ZXIgfHwgZmFsc2U7CmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9y dC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9C dWlsZGJvdENvbWJpbmVkUXVldWVWaWV3LmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRi b3RDb21iaW5lZFF1ZXVlVmlldy5qcwppbmRleCAyZmY3MTgzLi4xNjVhM2UyIDEwMDY0NAotLS0g YS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNf aHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdENvbWJpbmVkUXVldWVWaWV3LmpzCisrKyBi L1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19o dG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90Q29tYmluZWRRdWV1ZVZpZXcuanMKQEAgLTI1 LDEwICsyNSwxNyBAQAogCiBCdWlsZGJvdENvbWJpbmVkUXVldWVWaWV3ID0gZnVuY3Rpb24ocXVl dWUpCiB7Ci0gICAgZm9yICh2YXIgaSA9IDEsIGVuZCA9IHF1ZXVlLmNvbWJpbmVkUXVldWVzLmxl bmd0aDsgaSA8IGVuZDsgKytpKSB7CisgICAgdmFyIGFsbF9icmFuY2ggPSB7fTsKKyAgICBmb3Ig KHZhciBpID0gMCwgZW5kID0gcXVldWUuY29tYmluZWRRdWV1ZXMubGVuZ3RoOyBpIDwgZW5kOyAr K2kpIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQocXVldWUuY29tYmluZWRRdWV1ZXNbMF0uYnVp bGRib3QgPT09IHF1ZXVlLmNvbWJpbmVkUXVldWVzW2ldLmJ1aWxkYm90KTsKLSAgICAgICAgY29u c29sZS5hc3NlcnQocXVldWUuY29tYmluZWRRdWV1ZXNbMF0uYnJhbmNoLm9wZW5Tb3VyY2UgPT09 IHF1ZXVlLmNvbWJpbmVkUXVldWVzW2ldLmJyYW5jaC5vcGVuU291cmNlKTsKLSAgICAgICAgY29u c29sZS5hc3NlcnQocXVldWUuY29tYmluZWRRdWV1ZXNbMF0uYnJhbmNoLmludGVybmFsID09PSBx dWV1ZS5jb21iaW5lZFF1ZXVlc1tpXS5icmFuY2guaW50ZXJuYWwpOworICAgICAgICB2YXIgYnJh bmNoID0gcXVldWUuY29tYmluZWRRdWV1ZXNbaV0uYnJhbmNoOworICAgICAgICBPYmplY3Qua2V5 cyhicmFuY2gpLmZvckVhY2goZnVuY3Rpb24gKGtleSkgeyAKKyAgICAgICAgICAgIHZhciB2YWx1 ZSA9IGJyYW5jaFtrZXldCisgICAgICAgICAgICBpZiAoYWxsX2JyYW5jaFtrZXldKQorICAgICAg ICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGFsbF9icmFuY2hba2V5XSA9PT0gdmFsdWUsICJWYWx1 ZSAiICsgYWxsX2JyYW5jaFtrZXldICsgIiBub3QgZXF1YWwgdG8gIiArIHZhbHVlICsgIiBpbiAi ICsgcXVldWUuaWQpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGFsbF9icmFu Y2hba2V5XSA9IHZhbHVlOworICAgICAgICB9KQogICAgIH0KIAogICAgIEJ1aWxkYm90UXVldWVW aWV3LmNhbGwodGhpcywgcXVldWUuY29tYmluZWRRdWV1ZXMpOwpkaWZmIC0tZ2l0IGEvVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFz aGJvYXJkL1NjcmlwdHMvV2ViS2l0QnVpbGRib3QuanMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9y dC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9X ZWJLaXRCdWlsZGJvdC5qcwppbmRleCA1MmYxYzAzLi45OGIzNzhmIDEwMDY0NAotLS0gYS9Ub29s cy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9k YXNoYm9hcmQvU2NyaXB0cy9XZWJLaXRCdWlsZGJvdC5qcworKysgYi9Ub29scy9CdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2Ny aXB0cy9XZWJLaXRCdWlsZGJvdC5qcwpAQCAtNzUsNiArNzUsMTEgQEAgV2ViS2l0QnVpbGRib3Qu cHJvdG90eXBlID0gewogICAgIF9fcHJvdG9fXzogQnVpbGRib3QucHJvdG90eXBlLAogICAgIHBl cmZvcm1hbmNlRGFzaGJvYXJkVVJMOiAgImh0dHBzOi8vcGVyZi53ZWJraXQub3JnIiwKIAorICAg IGdldCBkZWZhdWx0QnJhbmNoZXMoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHsgb3BlblNvdXJj ZTogInRydW5rIiB9OworICAgIH0sCisKICAgICBsYXlvdXRUZXN0UmVzdWx0c0RpcmVjdG9yeVVS TEZvckl0ZXJhdGlvbjogZnVuY3Rpb24oaXRlcmF0aW9uKQogICAgIHsKICAgICAgICAgcmV0dXJu IHRoaXMuYmFzZVVSTCArICJyZXN1bHRzLyIgKyBlbmNvZGVVUklDb21wb25lbnQoaXRlcmF0aW9u LnF1ZXVlLmlkKSArICIvIiArIGVuY29kZVVSSUNvbXBvbmVudCgiciIgKyBpdGVyYXRpb24ub3Bl blNvdXJjZVJldmlzaW9uICsgIiAoIiArIGl0ZXJhdGlvbi5pZCArICIpIik7CmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjA2MTE3Yy4uZjE2OWNk YSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI0IEBACisyMDE1LTA3LTIwICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxAYXBwbGUu Y29tPgorCisgICAgICAgIFJlbW92ZSBoYXJkY29kZWQgImludGVybmFsIiBmcm9tIEJ1aWxkYm90 LnByb3RvdHlwZS5fbm9ybWFsaXplUXVldWVJbmZvLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MDQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdC5qczoKKyAg ICAgICAgKEJ1aWxkYm90LnByb3RvdHlwZS5nZXQgZGVmYXVsdEJyYW5jaGVzKToKKyAgICAgICAg QWRkZWQgYSBiYXNlIGNsYXNzIGdldHRlciBjYWxsZWQgZGVmYXVsdEJyYW5jaGVzIHRvIHJldHVy biBhbiBlbXB0eSBkaWN0aW9uYXJ5LgorICAgICAgICAoQnVpbGRib3QucHJvdG90eXBlLl9ub3Jt YWxpemVRdWV1ZUluZm8pOgorICAgICAgICBUaGUgX25vcm1hbGl6ZVF1ZXVlSW5mbyBtZXRob2Qg bm93IGNhbGxzIHRoZSBkZWZhdWx0QnJhbmNoZXMgZ2V0dGVyIGluc3RlYWQgb2YgdXNpbmcgaGFy ZGNvZGVkIHZhbHVlcworICAgICAgICBpbiBjYXNlcyB3aGVyZSB0aGUgcXVldWUuYnJhbmNoIHBy b3BlcnR5IGlzIG5vdCBzZXQgYW5kIHRoZSBxdWV1ZSBpcyBub3QgYSBjb21iaW5lZCBxdWV1ZS4K KyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJs aWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdENvbWJpbmVkUXVldWVWaWV3LmpzOgor ICAgICAgICAoQnVpbGRib3RDb21iaW5lZFF1ZXVlVmlldyk6CisgICAgICAgIEVuc3VyaW5nIHVu aWZvcm1pdHkgb2YgcmVwb3NpdG9yeSBicmFuY2hlcyB3aXRoaW4gYSBjb21iaW5lZCBxdWV1ZS4K KyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJs aWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9XZWJLaXRCdWlsZGJvdC5qczoKKyAgICAgICAgKFdl YktpdEJ1aWxkYm90LnByb3RvdHlwZS5nZXQgZGVmYXVsdEJyYW5jaGVzKToKKyAgICAgICAgT3Zl cnJpZGVzIHRoZSBiYXNlIGNsYXNzIGFuZCBwcm92aWRlcyBhIHdlYmtpdC1zcGVjaWZpYyBpbXBs ZW1lbnRhdGlvbiB0aGF0IHNldHMgdGhlIHF1ZXVlLmJyYW5jaGVzCisgICAgICAgIGRpY3Rpb25h cnkgdG8gaGF2ZSBhIHNpbmdsZSBlbnRyeSBmb3IgIm9wZW5Tb3VyY2UiIGFzIHRoZSBkZWZhdWx0 IHNldCBvZiBicmFuY2hlcy4KKwogMjAxNS0wNy0yMCAgVG9tYXMgUG9wZWxhICA8dHBvcGVsYUBy ZWRoYXQuY29tPgogCiAgICAgICAgIFtHVEtdIEFkZCBzZWxlY3Rpb24tY2hhbmdlZCBzaWduYWwg dG8gdGhlIFdlYktpdDIgQVBJCi0tIAoyLjMuOCAoQXBwbGUgR2l0LTU4KQoK 257198 2015-07-21 13:26:03 -0700 2015-07-21 16:30:10 -0700 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. 0001-Remove-hardcoded-internal-from-Buildbot.prototype._n.patch text/plain 6283 jmarcell RnJvbSA1OTlmZTcxZDRkNjUzNTNiNTJiZGI4OGVmZDM1ZDM4ODM1MDdkMmNjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYXNvbiBNYXJjZWxsIDxqbWFyY2VsbEBhcHBsZS5jb20+CkRh dGU6IFR1ZSwgMjEgSnVsIDIwMTUgMTM6MTY6MDggLTA3MDAKU3ViamVjdDogW1BBVENIXSBSZW1v dmUgaGFyZGNvZGVkICJpbnRlcm5hbCIgZnJvbQogQnVpbGRib3QucHJvdG90eXBlLl9ub3JtYWxp emVRdWV1ZUluZm8uCgotLS0KIC4uLi9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWls ZGJvdC5qcyAgICAgICB8ICA5ICsrKysrKysrLQogLi4uL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxk Ym90Q29tYmluZWRRdWV1ZVZpZXcuanMgIHwgMTggKysrKysrKysrKysrKysrLS0tCiAuLi4vcHVi bGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvV2ViS2l0QnVpbGRib3QuanMgfCAgNSArKysrKwog VG9vbHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMjEg KysrKysrKysrKysrKysrKysrKysrCiA0IGZpbGVzIGNoYW5nZWQsIDQ5IGluc2VydGlvbnMoKyks IDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRi b3QuanMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9w dWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdC5qcwppbmRleCA4NTU2MjRjLi43 Yzg1NjlmIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdC5qcworKysg Yi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNf aHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdC5qcwpAQCAtOTUsNiArOTUsMTEgQEAgQnVp bGRib3QucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5fYXV0aGVudGljYXRpb25T dGF0dXMgPT09IEJ1aWxkYm90LkF1dGhlbnRpY2F0aW9uU3RhdHVzLkF1dGhlbnRpY2F0ZWQ7CiAg ICAgfSwKIAorICAgIGdldCBkZWZhdWx0QnJhbmNoZXMoKQorICAgIHsKKyAgICAgICAgcmV0dXJu IHt9OworICAgIH0sCisKICAgICBzZXQgaXNBdXRoZW50aWNhdGVkKHZhbHVlKQogICAgIHsKICAg ICAgICAgdGhpcy5fYXV0aGVudGljYXRpb25TdGF0dXMgPSB2YWx1ZSA/IEJ1aWxkYm90LkF1dGhl bnRpY2F0aW9uU3RhdHVzLkF1dGhlbnRpY2F0ZWQgOiBCdWlsZGJvdC5BdXRoZW50aWNhdGlvblN0 YXR1cy5JbnZhbGlkQ3JlZGVudGlhbHM7CkBAIC0xMDIsNyArMTA3LDkgQEAgQnVpbGRib3QucHJv dG90eXBlID0gewogCiAgICAgX25vcm1hbGl6ZVF1ZXVlSW5mbzogZnVuY3Rpb24ocXVldWVJbmZv KQogICAgIHsKLSAgICAgICAgcXVldWVJbmZvLmJyYW5jaCA9IHF1ZXVlSW5mby5icmFuY2ggfHwg eyBvcGVuU291cmNlOiAidHJ1bmsiLCBpbnRlcm5hbDogInRydW5rIiB9OworICAgICAgICBpZiAo IXF1ZXVlSW5mby5jb21iaW5lZFF1ZXVlcykgeworICAgICAgICAgICAgcXVldWVJbmZvLmJyYW5j aCA9IHF1ZXVlSW5mby5icmFuY2ggfHwgdGhpcy5kZWZhdWx0QnJhbmNoZXM7CisgICAgICAgIH0K ICAgICAgICAgcXVldWVJbmZvLmRlYnVnID0gcXVldWVJbmZvLmRlYnVnIHx8IGZhbHNlOwogICAg ICAgICBxdWV1ZUluZm8uYnVpbGRlciA9IHF1ZXVlSW5mby5idWlsZGVyIHx8IGZhbHNlOwogICAg ICAgICBxdWV1ZUluZm8udGVzdGVyID0gcXVldWVJbmZvLnRlc3RlciB8fCBmYWxzZTsKZGlmZiAt LWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1 YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90Q29tYmluZWRRdWV1ZVZpZXcuanMg Yi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNf aHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdENvbWJpbmVkUXVldWVWaWV3LmpzCmluZGV4 IDJmZjcxODMuLjEzN2FmYTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxk Ym90Q29tYmluZWRRdWV1ZVZpZXcuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRi b3RDb21iaW5lZFF1ZXVlVmlldy5qcwpAQCAtMjUsMTAgKzI1LDIyIEBACiAKIEJ1aWxkYm90Q29t YmluZWRRdWV1ZVZpZXcgPSBmdW5jdGlvbihxdWV1ZSkKIHsKLSAgICBmb3IgKHZhciBpID0gMSwg ZW5kID0gcXVldWUuY29tYmluZWRRdWV1ZXMubGVuZ3RoOyBpIDwgZW5kOyArK2kpIHsKKyAgICBj b25zb2xlLmFzc2VydChxdWV1ZS5icmFuY2ggPT09IHVuZGVmaW5lZCk7CisgICAgdmFyIGluZGV4 T2ZGaXJzdFF1ZXVlV2l0aFJlcG9zaXRvcnkgPSB7fTsKKyAgICBmb3IgKHZhciBpID0gMCwgZW5k ID0gcXVldWUuY29tYmluZWRRdWV1ZXMubGVuZ3RoOyBpIDwgZW5kOyArK2kpIHsKICAgICAgICAg Y29uc29sZS5hc3NlcnQocXVldWUuY29tYmluZWRRdWV1ZXNbMF0uYnVpbGRib3QgPT09IHF1ZXVl LmNvbWJpbmVkUXVldWVzW2ldLmJ1aWxkYm90KTsKLSAgICAgICAgY29uc29sZS5hc3NlcnQocXVl dWUuY29tYmluZWRRdWV1ZXNbMF0uYnJhbmNoLm9wZW5Tb3VyY2UgPT09IHF1ZXVlLmNvbWJpbmVk UXVldWVzW2ldLmJyYW5jaC5vcGVuU291cmNlKTsKLSAgICAgICAgY29uc29sZS5hc3NlcnQocXVl dWUuY29tYmluZWRRdWV1ZXNbMF0uYnJhbmNoLmludGVybmFsID09PSBxdWV1ZS5jb21iaW5lZFF1 ZXVlc1tpXS5icmFuY2guaW50ZXJuYWwpOworICAgICAgICB2YXIgYnJhbmNoZXMgPSBxdWV1ZS5j b21iaW5lZFF1ZXVlc1tpXS5icmFuY2g7CisgICAgICAgIGZvciAodmFyIHJlcG9zaXRvcnkgaW4g YnJhbmNoZXMpIHsKKyAgICAgICAgICAgIHZhciBpbmRleE9mRmlyc3RRdWV1ZSA9IGluZGV4T2ZG aXJzdFF1ZXVlV2l0aFJlcG9zaXRvcnlbcmVwb3NpdG9yeV07CisgICAgICAgICAgICBpZiAoaW5k ZXhPZkZpcnN0UXVldWUgPT09IHVuZGVmaW5lZCkgeworICAgICAgICAgICAgICAgIGluZGV4T2ZG aXJzdFF1ZXVlV2l0aFJlcG9zaXRvcnlbcmVwb3NpdG9yeV0gPSBpOworICAgICAgICAgICAgICAg IGNvbnRpbnVlOworICAgICAgICAgICAgfQorICAgICAgICAgICAgdmFyIG1lc3NhZ2UgPSBxdWV1 ZS5pZCArICI6IGNvbWJpbmVkUXVldWVzWyIgKyBpICsgIl0uYnJhbmNoWyIgKyByZXBvc2l0b3J5 ICsgIl0iOworICAgICAgICAgICAgbWVzc2FnZSArPSAiID09PSBjb21iaW5lZFF1ZXVlc1siICsg aW5kZXhPZkZpcnN0UXVldWUgKyAiXS5icmFuY2hbIiArIHJlcG9zaXRvcnkgKyAiXSI7CisgICAg ICAgICAgICBjb25zb2xlLmFzc2VydChxdWV1ZS5jb21iaW5lZFF1ZXVlc1tpXS5icmFuY2hbcmVw b3NpdG9yeV0KKyAgICAgICAgICAgICAgICA9PT0gcXVldWUuY29tYmluZWRRdWV1ZXNbaW5kZXhP ZkZpcnN0UXVldWVdLmJyYW5jaFtyZXBvc2l0b3J5XSwgbWVzc2FnZSk7CisgICAgICAgIH0KICAg ICB9CiAKICAgICBCdWlsZGJvdFF1ZXVlVmlldy5jYWxsKHRoaXMsIHF1ZXVlLmNvbWJpbmVkUXVl dWVzKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1dlYktpdEJ1aWxkYm90Lmpz IGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvV2ViS2l0QnVpbGRib3QuanMKaW5kZXggNTJmMWMwMy4u OThiMzc4ZiAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvV2ViS2l0QnVpbGRib3Qu anMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv cHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvV2ViS2l0QnVpbGRib3QuanMKQEAgLTc1LDYg Kzc1LDExIEBAIFdlYktpdEJ1aWxkYm90LnByb3RvdHlwZSA9IHsKICAgICBfX3Byb3RvX186IEJ1 aWxkYm90LnByb3RvdHlwZSwKICAgICBwZXJmb3JtYW5jZURhc2hib2FyZFVSTDogICJodHRwczov L3BlcmYud2Via2l0Lm9yZyIsCiAKKyAgICBnZXQgZGVmYXVsdEJyYW5jaGVzKCkKKyAgICB7Cisg ICAgICAgIHJldHVybiB7IG9wZW5Tb3VyY2U6ICJ0cnVuayIgfTsKKyAgICB9LAorCiAgICAgbGF5 b3V0VGVzdFJlc3VsdHNEaXJlY3RvcnlVUkxGb3JJdGVyYXRpb246IGZ1bmN0aW9uKGl0ZXJhdGlv bikKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLmJhc2VVUkwgKyAicmVzdWx0cy8iICsgZW5j b2RlVVJJQ29tcG9uZW50KGl0ZXJhdGlvbi5xdWV1ZS5pZCkgKyAiLyIgKyBlbmNvZGVVUklDb21w b25lbnQoInIiICsgaXRlcmF0aW9uLm9wZW5Tb3VyY2VSZXZpc2lvbiArICIgKCIgKyBpdGVyYXRp b24uaWQgKyAiKSIpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IDYwNjExN2MuLjY2YWNjOGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxNS0wNy0yMSAgSmFzb24g TWFyY2VsbCAgPGptYXJjZWxsQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgaGFyZGNvZGVk ICJpbnRlcm5hbCIgZnJvbSBCdWlsZGJvdC5wcm90b3R5cGUuX25vcm1hbGl6ZVF1ZXVlSW5mby4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzA0Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvQnVpbGRib3QuanM6CisgICAgICAgIChCdWlsZGJvdC5wcm90b3R5cGUuZ2V0IGRl ZmF1bHRCcmFuY2hlcyk6CisgICAgICAgIEFkZGVkIGEgYmFzZSBjbGFzcyBnZXR0ZXIgY2FsbGVk IGRlZmF1bHRCcmFuY2hlcyB0byByZXR1cm4gYW4gZW1wdHkgZGljdGlvbmFyeS4KKyAgICAgICAg KEJ1aWxkYm90LnByb3RvdHlwZS5fbm9ybWFsaXplUXVldWVJbmZvKToKKyAgICAgICAgVGhlIF9u b3JtYWxpemVRdWV1ZUluZm8gbWV0aG9kIG5vdyBjYWxscyB0aGUgZGVmYXVsdEJyYW5jaGVzIGdl dHRlciBpbnN0ZWFkIG9mIHVzaW5nIGhhcmRjb2RlZCB2YWx1ZXMKKyAgICAgICAgaW4gY2FzZXMg d2hlcmUgdGhlIHF1ZXVlLmJyYW5jaCBwcm9wZXJ0eSBpcyBub3Qgc2V0IGFuZCB0aGUgcXVldWUg aXMgbm90IGEgY29tYmluZWQgcXVldWUuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRi b3RDb21iaW5lZFF1ZXVlVmlldy5qczoKKyAgICAgICAgKEJ1aWxkYm90Q29tYmluZWRRdWV1ZVZp ZXcpOgorICAgICAgICBFbnN1cmluZyB1bmlmb3JtaXR5IG9mIHJlcG9zaXRvcnkgYnJhbmNoZXMg d2l0aGluIGEgY29tYmluZWQgcXVldWUuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvV2ViS2l0 QnVpbGRib3QuanM6CisgICAgICAgIChXZWJLaXRCdWlsZGJvdC5wcm90b3R5cGUuZ2V0IGRlZmF1 bHRCcmFuY2hlcyk6CisgICAgICAgIE92ZXJyaWRlcyB0aGUgYmFzZSBjbGFzcyBhbmQgcHJvdmlk ZXMgYSB3ZWJraXQtc3BlY2lmaWMgaW1wbGVtZW50YXRpb24gdGhhdCBzZXRzIHRoZSBxdWV1ZS5i cmFuY2hlcworICAgICAgICBkaWN0aW9uYXJ5IHRvIGhhdmUgYSBzaW5nbGUgZW50cnkgZm9yICJv cGVuU291cmNlIiBhcyB0aGUgZGVmYXVsdCBzZXQgb2YgYnJhbmNoZXMuCisKIDIwMTUtMDctMjAg IFRvbWFzIFBvcGVsYSAgPHRwb3BlbGFAcmVkaGF0LmNvbT4KIAogICAgICAgICBbR1RLXSBBZGQg c2VsZWN0aW9uLWNoYW5nZWQgc2lnbmFsIHRvIHRoZSBXZWJLaXQyIEFQSQotLSAKMi4zLjggKEFw cGxlIEdpdC01OCkKCg== 257217 2015-07-21 16:30:10 -0700 2015-07-21 18:01:37 -0700 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. 0001-Remove-hardcoded-internal-from-Buildbot.prototype._n.patch text/plain 5741 jmarcell RnJvbSBkODBiOTg1NWQyM2U2YzRiZDI5MzY3MzE0NDRmZGM0NjNhOWNhNzliIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYXNvbiBNYXJjZWxsIDxqbWFyY2VsbEBhcHBsZS5jb20+CkRh dGU6IFR1ZSwgMjEgSnVsIDIwMTUgMTY6MTU6MjkgLTA3MDAKU3ViamVjdDogW1BBVENIXSBSZW1v dmUgaGFyZGNvZGVkICJpbnRlcm5hbCIgZnJvbQogQnVpbGRib3QucHJvdG90eXBlLl9ub3JtYWxp emVRdWV1ZUluZm8uCgotLS0KIC4uLi9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWls ZGJvdC5qcyAgICAgICAgIHwgIDMgKystCiAuLi4vZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RD b21iaW5lZFF1ZXVlVmlldy5qcyAgICB8IDE4ICsrKysrKysrKysrKysrKy0tLQogLi4uL3B1Ymxp Y19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1dlYktpdEJ1aWxkYm90LmpzICAgfCAgNSArKysrKwog VG9vbHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAx OSArKysrKysrKysrKysrKysrKysrCiA0IGZpbGVzIGNoYW5nZWQsIDQxIGluc2VydGlvbnMoKyks IDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRi b3QuanMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9w dWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdC5qcwppbmRleCA4NTU2MjRjLi5m ODBmMjZmIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdC5qcworKysg Yi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNf aHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdC5qcwpAQCAtMTAyLDcgKzEwMiw4IEBAIEJ1 aWxkYm90LnByb3RvdHlwZSA9IHsKIAogICAgIF9ub3JtYWxpemVRdWV1ZUluZm86IGZ1bmN0aW9u KHF1ZXVlSW5mbykKICAgICB7Ci0gICAgICAgIHF1ZXVlSW5mby5icmFuY2ggPSBxdWV1ZUluZm8u YnJhbmNoIHx8IHsgb3BlblNvdXJjZTogInRydW5rIiwgaW50ZXJuYWw6ICJ0cnVuayIgfTsKKyAg ICAgICAgaWYgKCFxdWV1ZUluZm8uY29tYmluZWRRdWV1ZXMpCisgICAgICAgICAgICBxdWV1ZUlu Zm8uYnJhbmNoID0gcXVldWVJbmZvLmJyYW5jaCB8fCB0aGlzLmRlZmF1bHRCcmFuY2hlczsKICAg ICAgICAgcXVldWVJbmZvLmRlYnVnID0gcXVldWVJbmZvLmRlYnVnIHx8IGZhbHNlOwogICAgICAg ICBxdWV1ZUluZm8uYnVpbGRlciA9IHF1ZXVlSW5mby5idWlsZGVyIHx8IGZhbHNlOwogICAgICAg ICBxdWV1ZUluZm8udGVzdGVyID0gcXVldWVJbmZvLnRlc3RlciB8fCBmYWxzZTsKZGlmZiAtLWdp dCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1Ymxp Y19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90Q29tYmluZWRRdWV1ZVZpZXcuanMgYi9U b29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRt bC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdENvbWJpbmVkUXVldWVWaWV3LmpzCmluZGV4IDJm ZjcxODMuLjEzN2FmYTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90 Q29tYmluZWRRdWV1ZVZpZXcuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQu d2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RD b21iaW5lZFF1ZXVlVmlldy5qcwpAQCAtMjUsMTAgKzI1LDIyIEBACiAKIEJ1aWxkYm90Q29tYmlu ZWRRdWV1ZVZpZXcgPSBmdW5jdGlvbihxdWV1ZSkKIHsKLSAgICBmb3IgKHZhciBpID0gMSwgZW5k ID0gcXVldWUuY29tYmluZWRRdWV1ZXMubGVuZ3RoOyBpIDwgZW5kOyArK2kpIHsKKyAgICBjb25z b2xlLmFzc2VydChxdWV1ZS5icmFuY2ggPT09IHVuZGVmaW5lZCk7CisgICAgdmFyIGluZGV4T2ZG aXJzdFF1ZXVlV2l0aFJlcG9zaXRvcnkgPSB7fTsKKyAgICBmb3IgKHZhciBpID0gMCwgZW5kID0g cXVldWUuY29tYmluZWRRdWV1ZXMubGVuZ3RoOyBpIDwgZW5kOyArK2kpIHsKICAgICAgICAgY29u c29sZS5hc3NlcnQocXVldWUuY29tYmluZWRRdWV1ZXNbMF0uYnVpbGRib3QgPT09IHF1ZXVlLmNv bWJpbmVkUXVldWVzW2ldLmJ1aWxkYm90KTsKLSAgICAgICAgY29uc29sZS5hc3NlcnQocXVldWUu Y29tYmluZWRRdWV1ZXNbMF0uYnJhbmNoLm9wZW5Tb3VyY2UgPT09IHF1ZXVlLmNvbWJpbmVkUXVl dWVzW2ldLmJyYW5jaC5vcGVuU291cmNlKTsKLSAgICAgICAgY29uc29sZS5hc3NlcnQocXVldWUu Y29tYmluZWRRdWV1ZXNbMF0uYnJhbmNoLmludGVybmFsID09PSBxdWV1ZS5jb21iaW5lZFF1ZXVl c1tpXS5icmFuY2guaW50ZXJuYWwpOworICAgICAgICB2YXIgYnJhbmNoZXMgPSBxdWV1ZS5jb21i aW5lZFF1ZXVlc1tpXS5icmFuY2g7CisgICAgICAgIGZvciAodmFyIHJlcG9zaXRvcnkgaW4gYnJh bmNoZXMpIHsKKyAgICAgICAgICAgIHZhciBpbmRleE9mRmlyc3RRdWV1ZSA9IGluZGV4T2ZGaXJz dFF1ZXVlV2l0aFJlcG9zaXRvcnlbcmVwb3NpdG9yeV07CisgICAgICAgICAgICBpZiAoaW5kZXhP ZkZpcnN0UXVldWUgPT09IHVuZGVmaW5lZCkgeworICAgICAgICAgICAgICAgIGluZGV4T2ZGaXJz dFF1ZXVlV2l0aFJlcG9zaXRvcnlbcmVwb3NpdG9yeV0gPSBpOworICAgICAgICAgICAgICAgIGNv bnRpbnVlOworICAgICAgICAgICAgfQorICAgICAgICAgICAgdmFyIG1lc3NhZ2UgPSBxdWV1ZS5p ZCArICI6IGNvbWJpbmVkUXVldWVzWyIgKyBpICsgIl0uYnJhbmNoWyIgKyByZXBvc2l0b3J5ICsg Il0iOworICAgICAgICAgICAgbWVzc2FnZSArPSAiID09PSBjb21iaW5lZFF1ZXVlc1siICsgaW5k ZXhPZkZpcnN0UXVldWUgKyAiXS5icmFuY2hbIiArIHJlcG9zaXRvcnkgKyAiXSI7CisgICAgICAg ICAgICBjb25zb2xlLmFzc2VydChxdWV1ZS5jb21iaW5lZFF1ZXVlc1tpXS5icmFuY2hbcmVwb3Np dG9yeV0KKyAgICAgICAgICAgICAgICA9PT0gcXVldWUuY29tYmluZWRRdWV1ZXNbaW5kZXhPZkZp cnN0UXVldWVdLmJyYW5jaFtyZXBvc2l0b3J5XSwgbWVzc2FnZSk7CisgICAgICAgIH0KICAgICB9 CiAKICAgICBCdWlsZGJvdFF1ZXVlVmlldy5jYWxsKHRoaXMsIHF1ZXVlLmNvbWJpbmVkUXVldWVz KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1dlYktpdEJ1aWxkYm90LmpzIGIv VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0 bWwvZGFzaGJvYXJkL1NjcmlwdHMvV2ViS2l0QnVpbGRib3QuanMKaW5kZXggNTJmMWMwMy4uOThi Mzc4ZiAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvV2ViS2l0QnVpbGRib3QuanMK KysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVi bGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvV2ViS2l0QnVpbGRib3QuanMKQEAgLTc1LDYgKzc1 LDExIEBAIFdlYktpdEJ1aWxkYm90LnByb3RvdHlwZSA9IHsKICAgICBfX3Byb3RvX186IEJ1aWxk Ym90LnByb3RvdHlwZSwKICAgICBwZXJmb3JtYW5jZURhc2hib2FyZFVSTDogICJodHRwczovL3Bl cmYud2Via2l0Lm9yZyIsCiAKKyAgICBnZXQgZGVmYXVsdEJyYW5jaGVzKCkKKyAgICB7CisgICAg ICAgIHJldHVybiB7IG9wZW5Tb3VyY2U6ICJ0cnVuayIgfTsKKyAgICB9LAorCiAgICAgbGF5b3V0 VGVzdFJlc3VsdHNEaXJlY3RvcnlVUkxGb3JJdGVyYXRpb246IGZ1bmN0aW9uKGl0ZXJhdGlvbikK ICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLmJhc2VVUkwgKyAicmVzdWx0cy8iICsgZW5jb2Rl VVJJQ29tcG9uZW50KGl0ZXJhdGlvbi5xdWV1ZS5pZCkgKyAiLyIgKyBlbmNvZGVVUklDb21wb25l bnQoInIiICsgaXRlcmF0aW9uLm9wZW5Tb3VyY2VSZXZpc2lvbiArICIgKCIgKyBpdGVyYXRpb24u aWQgKyAiKSIpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n CmluZGV4IDYwNjExN2MuLjUwMjc5NjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysg Yi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxNS0wNy0yMSAgSmFzb24gTWFy Y2VsbCAgPGptYXJjZWxsQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgaGFyZGNvZGVkICJp bnRlcm5hbCIgZnJvbSBCdWlsZGJvdC5wcm90b3R5cGUuX25vcm1hbGl6ZVF1ZXVlSW5mby4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzA0MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQnVpbGRTbGF2 ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Nj cmlwdHMvQnVpbGRib3QuanM6CisgICAgICAgIChCdWlsZGJvdC5wcm90b3R5cGUuX25vcm1hbGl6 ZVF1ZXVlSW5mbyk6CisgICAgICAgIFRoZSBfbm9ybWFsaXplUXVldWVJbmZvIG1ldGhvZCBub3cg Y2FsbHMgdGhlIGRlZmF1bHRCcmFuY2hlcyBnZXR0ZXIgaW5zdGVhZCBvZiB1c2luZyBoYXJkY29k ZWQgdmFsdWVzCisgICAgICAgIGluIGNhc2VzIHdoZXJlIHRoZSBxdWV1ZS5icmFuY2ggcHJvcGVy dHkgaXMgbm90IHNldCBhbmQgdGhlIHF1ZXVlIGlzIG5vdCBhIGNvbWJpbmVkIHF1ZXVlLgorICAg ICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19o dG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90Q29tYmluZWRRdWV1ZVZpZXcuanM6CisgICAg ICAgIChCdWlsZGJvdENvbWJpbmVkUXVldWVWaWV3KToKKyAgICAgICAgRW5zdXJpbmcgdW5pZm9y bWl0eSBvZiByZXBvc2l0b3J5IGJyYW5jaGVzIHdpdGhpbiBhIGNvbWJpbmVkIHF1ZXVlLgorICAg ICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19o dG1sL2Rhc2hib2FyZC9TY3JpcHRzL1dlYktpdEJ1aWxkYm90LmpzOgorICAgICAgICAoV2ViS2l0 QnVpbGRib3QucHJvdG90eXBlLmdldCBkZWZhdWx0QnJhbmNoZXMpOgorICAgICAgICBPdmVycmlk ZXMgdGhlIGJhc2UgY2xhc3MgYW5kIHByb3ZpZGVzIGEgd2Via2l0LXNwZWNpZmljIGltcGxlbWVu dGF0aW9uIHRoYXQgc2V0cyB0aGUgcXVldWUuYnJhbmNoZXMKKyAgICAgICAgZGljdGlvbmFyeSB0 byBoYXZlIGEgc2luZ2xlIGVudHJ5IGZvciAib3BlblNvdXJjZSIgYXMgdGhlIGRlZmF1bHQgc2V0 IG9mIGJyYW5jaGVzLgorCiAyMDE1LTA3LTIwICBUb21hcyBQb3BlbGEgIDx0cG9wZWxhQHJlZGhh dC5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIHNlbGVjdGlvbi1jaGFuZ2VkIHNpZ25hbCB0byB0 aGUgV2ViS2l0MiBBUEkKLS0gCjIuMy44IChBcHBsZSBHaXQtNTgpCgo= 257228 2015-07-21 18:01:37 -0700 2015-07-22 12:01:59 -0700 Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo. 0001-Remove-hardcoded-internal-from-Buildbot.prototype._n.patch text/plain 6176 jmarcell RnJvbSBkMmRiMDkwNzZlYmNjYjQwOGVmMWJmZWVmYjc2MDZlOGU5YmQyNTA2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYXNvbiBNYXJjZWxsIDxqbWFyY2VsbEBhcHBsZS5jb20+CkRh dGU6IFR1ZSwgMjEgSnVsIDIwMTUgMTY6MTU6MjkgLTA3MDAKU3ViamVjdDogW1BBVENIXSBSZW1v dmUgaGFyZGNvZGVkICJpbnRlcm5hbCIgZnJvbQogQnVpbGRib3QucHJvdG90eXBlLl9ub3JtYWxp emVRdWV1ZUluZm8uCgotLS0KIC4uLi9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWls ZGJvdC5qcyAgICAgIHwgIDMgKystCiAuLi4vZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RDb21i aW5lZFF1ZXVlVmlldy5qcyB8IDE4ICsrKysrKysrKysrKysrLS0tCiAuLi4vZGFzaGJvYXJkL1Nj cmlwdHMvV2ViS2l0QnVpbGRib3QuanMgICAgICAgICAgICB8ICA1ICsrKysrCiBUb29scy9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8IDIzICsrKysrKysrKysr KysrKysrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgNDUgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdC5qcyBiL1Rv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1s L2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90LmpzCmluZGV4IDg1NTYyNGMuLmY4MGYyNmYgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90LmpzCisrKyBiL1Rvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hi b2FyZC9TY3JpcHRzL0J1aWxkYm90LmpzCkBAIC0xMDIsNyArMTAyLDggQEAgQnVpbGRib3QucHJv dG90eXBlID0gewogCiAgICAgX25vcm1hbGl6ZVF1ZXVlSW5mbzogZnVuY3Rpb24ocXVldWVJbmZv KQogICAgIHsKLSAgICAgICAgcXVldWVJbmZvLmJyYW5jaCA9IHF1ZXVlSW5mby5icmFuY2ggfHwg eyBvcGVuU291cmNlOiAidHJ1bmsiLCBpbnRlcm5hbDogInRydW5rIiB9OworICAgICAgICBpZiAo IXF1ZXVlSW5mby5jb21iaW5lZFF1ZXVlcykKKyAgICAgICAgICAgIHF1ZXVlSW5mby5icmFuY2gg PSBxdWV1ZUluZm8uYnJhbmNoIHx8IHRoaXMuZGVmYXVsdEJyYW5jaGVzOwogICAgICAgICBxdWV1 ZUluZm8uZGVidWcgPSBxdWV1ZUluZm8uZGVidWcgfHwgZmFsc2U7CiAgICAgICAgIHF1ZXVlSW5m by5idWlsZGVyID0gcXVldWVJbmZvLmJ1aWxkZXIgfHwgZmFsc2U7CiAgICAgICAgIHF1ZXVlSW5m by50ZXN0ZXIgPSBxdWV1ZUluZm8udGVzdGVyIHx8IGZhbHNlOwpkaWZmIC0tZ2l0IGEvVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFz aGJvYXJkL1NjcmlwdHMvQnVpbGRib3RDb21iaW5lZFF1ZXVlVmlldy5qcyBiL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2Fy ZC9TY3JpcHRzL0J1aWxkYm90Q29tYmluZWRRdWV1ZVZpZXcuanMKaW5kZXggMmZmNzE4My4uMTM3 YWZhNSAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RDb21iaW5lZFF1 ZXVlVmlldy5qcworKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdENvbWJpbmVkUXVl dWVWaWV3LmpzCkBAIC0yNSwxMCArMjUsMjIgQEAKIAogQnVpbGRib3RDb21iaW5lZFF1ZXVlVmll dyA9IGZ1bmN0aW9uKHF1ZXVlKQogewotICAgIGZvciAodmFyIGkgPSAxLCBlbmQgPSBxdWV1ZS5j b21iaW5lZFF1ZXVlcy5sZW5ndGg7IGkgPCBlbmQ7ICsraSkgeworICAgIGNvbnNvbGUuYXNzZXJ0 KHF1ZXVlLmJyYW5jaCA9PT0gdW5kZWZpbmVkKTsKKyAgICB2YXIgaW5kZXhPZkZpcnN0UXVldWVX aXRoUmVwb3NpdG9yeSA9IHt9OworICAgIGZvciAodmFyIGkgPSAwLCBlbmQgPSBxdWV1ZS5jb21i aW5lZFF1ZXVlcy5sZW5ndGg7IGkgPCBlbmQ7ICsraSkgewogICAgICAgICBjb25zb2xlLmFzc2Vy dChxdWV1ZS5jb21iaW5lZFF1ZXVlc1swXS5idWlsZGJvdCA9PT0gcXVldWUuY29tYmluZWRRdWV1 ZXNbaV0uYnVpbGRib3QpOwotICAgICAgICBjb25zb2xlLmFzc2VydChxdWV1ZS5jb21iaW5lZFF1 ZXVlc1swXS5icmFuY2gub3BlblNvdXJjZSA9PT0gcXVldWUuY29tYmluZWRRdWV1ZXNbaV0uYnJh bmNoLm9wZW5Tb3VyY2UpOwotICAgICAgICBjb25zb2xlLmFzc2VydChxdWV1ZS5jb21iaW5lZFF1 ZXVlc1swXS5icmFuY2guaW50ZXJuYWwgPT09IHF1ZXVlLmNvbWJpbmVkUXVldWVzW2ldLmJyYW5j aC5pbnRlcm5hbCk7CisgICAgICAgIHZhciBicmFuY2hlcyA9IHF1ZXVlLmNvbWJpbmVkUXVldWVz W2ldLmJyYW5jaDsKKyAgICAgICAgZm9yICh2YXIgcmVwb3NpdG9yeSBpbiBicmFuY2hlcykgewor ICAgICAgICAgICAgdmFyIGluZGV4T2ZGaXJzdFF1ZXVlID0gaW5kZXhPZkZpcnN0UXVldWVXaXRo UmVwb3NpdG9yeVtyZXBvc2l0b3J5XTsKKyAgICAgICAgICAgIGlmIChpbmRleE9mRmlyc3RRdWV1 ZSA9PT0gdW5kZWZpbmVkKSB7CisgICAgICAgICAgICAgICAgaW5kZXhPZkZpcnN0UXVldWVXaXRo UmVwb3NpdG9yeVtyZXBvc2l0b3J5XSA9IGk7CisgICAgICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgICAgICB9CisgICAgICAgICAgICB2YXIgbWVzc2FnZSA9IHF1ZXVlLmlkICsgIjogY29t YmluZWRRdWV1ZXNbIiArIGkgKyAiXS5icmFuY2hbIiArIHJlcG9zaXRvcnkgKyAiXSI7CisgICAg ICAgICAgICBtZXNzYWdlICs9ICIgPT09IGNvbWJpbmVkUXVldWVzWyIgKyBpbmRleE9mRmlyc3RR dWV1ZSArICJdLmJyYW5jaFsiICsgcmVwb3NpdG9yeSArICJdIjsKKyAgICAgICAgICAgIGNvbnNv bGUuYXNzZXJ0KHF1ZXVlLmNvbWJpbmVkUXVldWVzW2ldLmJyYW5jaFtyZXBvc2l0b3J5XQorICAg ICAgICAgICAgICAgID09PSBxdWV1ZS5jb21iaW5lZFF1ZXVlc1tpbmRleE9mRmlyc3RRdWV1ZV0u YnJhbmNoW3JlcG9zaXRvcnldLCBtZXNzYWdlKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIEJ1 aWxkYm90UXVldWVWaWV3LmNhbGwodGhpcywgcXVldWUuY29tYmluZWRRdWV1ZXMpOwpkaWZmIC0t Z2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVi bGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvV2ViS2l0QnVpbGRib3QuanMgYi9Ub29scy9CdWls ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9h cmQvU2NyaXB0cy9XZWJLaXRCdWlsZGJvdC5qcwppbmRleCA1MmYxYzAzLi45OGIzNzhmIDEwMDY0 NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9w dWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9XZWJLaXRCdWlsZGJvdC5qcworKysgYi9Ub29s cy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9k YXNoYm9hcmQvU2NyaXB0cy9XZWJLaXRCdWlsZGJvdC5qcwpAQCAtNzUsNiArNzUsMTEgQEAgV2Vi S2l0QnVpbGRib3QucHJvdG90eXBlID0gewogICAgIF9fcHJvdG9fXzogQnVpbGRib3QucHJvdG90 eXBlLAogICAgIHBlcmZvcm1hbmNlRGFzaGJvYXJkVVJMOiAgImh0dHBzOi8vcGVyZi53ZWJraXQu b3JnIiwKIAorICAgIGdldCBkZWZhdWx0QnJhbmNoZXMoKQorICAgIHsKKyAgICAgICAgcmV0dXJu IHsgb3BlblNvdXJjZTogInRydW5rIiB9OworICAgIH0sCisKICAgICBsYXlvdXRUZXN0UmVzdWx0 c0RpcmVjdG9yeVVSTEZvckl0ZXJhdGlvbjogZnVuY3Rpb24oaXRlcmF0aW9uKQogICAgIHsKICAg ICAgICAgcmV0dXJuIHRoaXMuYmFzZVVSTCArICJyZXN1bHRzLyIgKyBlbmNvZGVVUklDb21wb25l bnQoaXRlcmF0aW9uLnF1ZXVlLmlkKSArICIvIiArIGVuY29kZVVSSUNvbXBvbmVudCgiciIgKyBp dGVyYXRpb24ub3BlblNvdXJjZVJldmlzaW9uICsgIiAoIiArIGl0ZXJhdGlvbi5pZCArICIpIik7 CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjA2 MTE3Yy4uMWI4NTE5MSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE1LTA3LTIxICBKYXNvbiBNYXJjZWxsICA8am1h cmNlbGxAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBoYXJkY29kZWQgImludGVybmFsIiBm cm9tIEJ1aWxkYm90LnByb3RvdHlwZS5fbm9ybWFsaXplUXVldWVJbmZvLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MDQzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgRGFuaWVsIEJhdGVzIGFuZCBBbGV4ZXkgUHJvc2t1cnlha292LgorCisgICAgICAg ICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwv ZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3QuanM6CisgICAgICAgIChCdWlsZGJvdC5wcm90b3R5 cGUuX25vcm1hbGl6ZVF1ZXVlSW5mbyk6CisgICAgICAgIFRoZSBfbm9ybWFsaXplUXVldWVJbmZv IG1ldGhvZCBub3cgY2FsbHMgdGhlIGRlZmF1bHRCcmFuY2hlcyBnZXR0ZXIgaW5zdGVhZCBvZiB1 c2luZyBoYXJkY29kZWQgdmFsdWVzCisgICAgICAgIGluIGNhc2VzIHdoZXJlIHRoZSBxdWV1ZS5i cmFuY2ggcHJvcGVydHkgaXMgbm90IHNldCBhbmQgdGhlIHF1ZXVlIGlzIG5vdCBhIGNvbWJpbmVk IHF1ZXVlLgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90Q29tYmluZWRRdWV1ZVZp ZXcuanM6CisgICAgICAgIChCdWlsZGJvdENvbWJpbmVkUXVldWVWaWV3KToKKyAgICAgICAgRW5z dXJpbmcgdW5pZm9ybWl0eSBvZiByZXBvc2l0b3J5IGJyYW5jaGVzIHdpdGhpbiBhIGNvbWJpbmVk IHF1ZXVlLgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1dlYktpdEJ1aWxkYm90LmpzOgorICAg ICAgICAoV2ViS2l0QnVpbGRib3QucHJvdG90eXBlLmdldCBkZWZhdWx0QnJhbmNoZXMpOgorICAg ICAgICBBZGRlZDsgcHJvdmlkZXMgYSBXZWJLaXQtc3BlY2lmaWMgaW1wbGVtZW50YXRpb24gdGhh dCBzZXRzIHRoZSBxdWV1ZS5icmFuY2hlcyBkaWN0aW9uYXJ5IHRvIGhhdmUgYQorICAgICAgICBz aW5nbGUgZW50cnkgZm9yICJvcGVuU291cmNlIiBhcyB0aGUgZGVmYXVsdCBzZXQgb2YgYnJhbmNo ZXMuIE5vdGUgdGhhdCB3ZSBpbnRlbnRpb25hbGx5IG9taXR0ZWQgYQorICAgICAgICBiYXNlIGNs YXNzIGltcGxlbWVudGF0aW9uIG9mIHRoZSBkZWZhdWx0QnJhbmNoZXMgZ2V0dGVyIHNvIGFzIHRv IGNhdXNlIGEgSmF2YVNjcmlwdCBUeXBlRXJyb3Igd2hlbiBhCisgICAgICAgIHN1Yi1xdWV1ZSBv ZiBhIGNvbWJpbmVkIHF1ZXVlIGRvZXMgbm90IHNwZWNpZnkgcHJvcGVydHkgYnJhbmNoIGFuZCB0 aGUgZGVyaXZlZCBCdWlsZGJvdCBjbGFzcyBkb2VzIG5vdAorICAgICAgICBpbXBsZW1lbnQgZGVm YXVsdEJyYW5jaGVzIHNvIHRoYXQgYSBwZXJzb24gY2FuIGVpdGhlciB1cGRhdGUgdGhlIGRlZmlu aXRpb24gb2YgdGhlIHN1Yi1xdWV1ZSBvcgorICAgICAgICBpbXBsZW1lbnQgZGVmYXVsdEJyYW5j aGVzIGluIHRoZSBkZXJpdmVkIEJ1aWxkYm90IGNsYXNzIHRoZXkgYXJlIHVzaW5nLgorCiAyMDE1 LTA3LTIwICBUb21hcyBQb3BlbGEgIDx0cG9wZWxhQHJlZGhhdC5jb20+CiAKICAgICAgICAgW0dU S10gQWRkIHNlbGVjdGlvbi1jaGFuZ2VkIHNpZ25hbCB0byB0aGUgV2ViS2l0MiBBUEkKLS0gCjIu My44IChBcHBsZSBHaXQtNTgpCgo=