Mobrovac has submitted this change and it was merged.
Change subject: Update change-propagation to 58b4a2b
......................................................................
Update change-propagation to 58b4a2b
List of changes:
58b4a2b Use separate topic for transclusions (#105)
xxxxxxx Update node module dependencies
Change-Id: If0eac9bf776cddd048a2ae319575a64a11cf466c
---
M node_modules/bl/package.json
M node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
M
node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/lib/links.js
M
node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/lib/validate.js
M
node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/package.json
M
node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/package.json
M node_modules/hyperswitch/node_modules/swagger-ui/package.json
M node_modules/js-yaml/package.json
M node_modules/service-runner/lib/ratelimiter.js
M
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M node_modules/service-runner/package.json
M src
12 files changed, 102 insertions(+), 49 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/node_modules/bl/package.json b/node_modules/bl/package.json
index 3742063..c1c2c86 100644
--- a/node_modules/bl/package.json
+++ b/node_modules/bl/package.json
@@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
- "url": "https://github.com/rvagg/bl.git";
+ "url": "git+https://github.com/rvagg/bl.git";
},
"homepage": "https://github.com/rvagg/bl";,
"authors": [
@@ -59,5 +59,6 @@
"tmp": "tmp/bl-1.1.2.tgz_1455246621698_0.6300242957659066"
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz";
+ "_resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git
a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
index c85e690..63f71d5 100644
--- a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
+++ b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
@@ -50,7 +50,7 @@
"url": "https://github.com/substack/json-stable-stringify/issues";
},
"_id": "json-stable-stringify@1.0.0",
- "_shasum": "ae9735ba10292dbe0c8f254697da8e18f5e10e37",
+ "_shasum": "ee904a72bde1656f18d702295c424e1e6d88f8f5",
"_from": "git+https://github.com/wikimedia/json-stable-stringify.git#master";,
"_resolved":
"git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f";
}
diff --git
a/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/lib/links.js
b/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/lib/links.js
index 1bea0aa..8a87f02 100644
---
a/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/lib/links.js
+++
b/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/lib/links.js
@@ -3,8 +3,22 @@
* Copyright (c) 2007 Kris Zyp SitePen (www.sitepen.com)
* Licensed under the MIT (MIT-LICENSE.txt) license.
*/
-({define:typeof define!="undefined"?define:function(deps,
factory){module.exports = factory();}}).
-define([], function(){
+(function (root, factory) {
+ if (typeof define === 'function' && define.amd) {
+ // AMD. Register as an anonymous module.
+ define([], function () {
+ return factory();
+ });
+ } else if (typeof module === 'object' && module.exports) {
+ // Node. Does not work with strict CommonJS, but
+ // only CommonJS-like environments that support module.exports,
+ // like Node.
+ module.exports = factory();
+ } else {
+ // Browser globals
+ root.jsonSchemaLinks = factory();
+ }
+}(this, function () {// setup primitive classes to be JSON Schema types
var exports = {};
exports.cacheLinks = true;
exports.getLink = function(relation, instance, schema){
@@ -49,4 +63,4 @@
});
};
return exports;
-});
\ No newline at end of file
+}));
\ No newline at end of file
diff --git
a/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/lib/validate.js
b/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/lib/validate.js
index 55d4c3a..e4dc151 100644
---
a/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/lib/validate.js
+++
b/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/lib/validate.js
@@ -13,10 +13,23 @@
"property" which indicates which property had the error
"message" which indicates what the error was
*/
-({define:typeof define!="undefined"?define:function(deps,
factory){module.exports = factory();}}).
-define([], function(){
-var exports = validate;
-// setup primitive classes to be JSON Schema types
+(function (root, factory) {
+ if (typeof define === 'function' && define.amd) {
+ // AMD. Register as an anonymous module.
+ define([], function () {
+ return factory();
+ });
+ } else if (typeof module === 'object' && module.exports) {
+ // Node. Does not work with strict CommonJS, but
+ // only CommonJS-like environments that support module.exports,
+ // like Node.
+ module.exports = factory();
+ } else {
+ // Browser globals
+ root.jsonSchema = factory();
+ }
+}(this, function () {// setup primitive classes to be JSON Schema types
+var exports = validate
exports.Integer = {type:"integer"};
var primitiveConstructors = {
String: String,
@@ -257,4 +270,4 @@
}
return exports;
-});
+}));
diff --git
a/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/package.json
b/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/package.json
index 9871183..2e1c558 100644
---
a/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/package.json
+++
b/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/package.json
@@ -1,6 +1,6 @@
{
"name": "json-schema",
- "version": "0.2.2",
+ "version": "0.2.3",
"author": {
"name": "Kris Zyp"
},
@@ -27,7 +27,7 @@
],
"repository": {
"type": "git",
- "url": "http://github.com/kriszyp/json-schema";
+ "url": "git+ssh://g...@github.com/kriszyp/json-schema.git"
},
"directories": {
"lib": "./lib"
@@ -39,17 +39,27 @@
"scripts": {
"test": "echo TESTS DISABLED vows --spec test/*.js"
},
- "_id": "json-schema@0.2.2",
- "dist": {
- "shasum": "50354f19f603917c695f70b85afa77c3b0f23506",
- "tarball": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";
+ "gitHead": "07ae2c618b5f581dbc108e065f4f95dcf0a1d85f",
+ "bugs": {
+ "url": "https://github.com/kriszyp/json-schema/issues";
},
- "_npmVersion": "1.1.59",
+ "homepage": "https://github.com/kriszyp/json-schema#readme";,
+ "_id": "json-schema@0.2.3",
+ "_shasum": "b480c892e59a2f05954ce727bd3f2a4e882f9e13",
+ "_from": "json-schema@0.2.3",
+ "_npmVersion": "3.8.9",
+ "_nodeVersion": "6.1.0",
"_npmUser": {
"name": "kriszyp",
"email": "kris...@gmail.com"
},
- "_shasum": "50354f19f603917c695f70b85afa77c3b0f23506",
- "_resolved":
"https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";,
- "_from": "json-schema@0.2.2"
+ "dist": {
+ "shasum": "b480c892e59a2f05954ce727bd3f2a4e882f9e13",
+ "tarball": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
+ },
+ "_npmOperationalInternal": {
+ "host": "packages-12-west.internal.npmjs.com",
+ "tmp": "tmp/json-schema-0.2.3.tgz_1473699189380_0.7420965158380568"
+ },
+ "_resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
}
diff --git
a/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/package.json
b/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/package.json
index cdfa8ce..f723c5a 100644
---
a/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/package.json
+++
b/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/jsprim/package.json
@@ -1,6 +1,6 @@
{
"name": "jsprim",
- "version": "1.3.0",
+ "version": "1.3.1",
"description": "utilities for primitive JavaScript types",
"main": "./lib/jsprim.js",
"repository": {
@@ -9,23 +9,23 @@
},
"dependencies": {
"extsprintf": "1.0.2",
- "json-schema": "0.2.2",
+ "json-schema": "0.2.3",
"verror": "1.3.6"
},
"engines": [
"node >=0.6.0"
],
"license": "MIT",
- "gitHead": "694edcb22e2291c21f6c2a23907bf02e1edbfdf4",
+ "gitHead": "825aba45c6cff4340c18cdae363ccb5bdf840bd7",
"bugs": {
"url": "https://github.com/davepacheco/node-jsprim/issues";
},
"homepage": "https://github.com/davepacheco/node-jsprim#readme";,
- "_id": "jsprim@1.3.0",
+ "_id": "jsprim@1.3.1",
"scripts": {},
- "_shasum": "ce2e1bef835204b4f3099928c602f8b6ae615650",
+ "_shasum": "2a7256f70412a29ee3670aaca625994c4dcff252",
"_from": "jsprim@>=1.2.2 <2.0.0",
- "_npmVersion": "2.11.3",
+ "_npmVersion": "2.15.9",
"_nodeVersion": "0.12.7",
"_npmUser": {
"name": "dap",
@@ -38,13 +38,13 @@
}
],
"dist": {
- "shasum": "ce2e1bef835204b4f3099928c602f8b6ae615650",
- "tarball": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz";
+ "shasum": "2a7256f70412a29ee3670aaca625994c4dcff252",
+ "tarball": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz";
},
"_npmOperationalInternal": {
- "host": "packages-12-west.internal.npmjs.com",
- "tmp": "tmp/jsprim-1.3.0.tgz_1466708163640_0.5282344303559512"
+ "host": "packages-16-east.internal.npmjs.com",
+ "tmp": "tmp/jsprim-1.3.1.tgz_1473725209917_0.5387293708045036"
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz";
+ "_resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz";
}
diff --git a/node_modules/hyperswitch/node_modules/swagger-ui/package.json
b/node_modules/hyperswitch/node_modules/swagger-ui/package.json
index 447d746..1d0335e 100644
--- a/node_modules/hyperswitch/node_modules/swagger-ui/package.json
+++ b/node_modules/hyperswitch/node_modules/swagger-ui/package.json
@@ -70,7 +70,7 @@
"url": "https://github.com/swagger-api/swagger-ui/issues";
},
"_id": "swagger-ui@2.2.2",
- "_shasum": "6f2e3a192f482dceecf1a29fc6850f07f0486e9c",
+ "_shasum": "f4a37769557ed89af85cb0a706c03f54168e27c1",
"_from": "git+https://github.com/wikimedia/swagger-ui.git#master";,
"_resolved":
"git+https://github.com/wikimedia/swagger-ui.git#f89ca3d27111bde918492db6d7eaca37302407f6";
}
diff --git a/node_modules/js-yaml/package.json
b/node_modules/js-yaml/package.json
index 290ff35..fc64e81 100644
--- a/node_modules/js-yaml/package.json
+++ b/node_modules/js-yaml/package.json
@@ -89,5 +89,6 @@
"tmp": "tmp/js-yaml-3.6.1.tgz_1462995636349_0.2209061929024756"
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
+ "_resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/service-runner/lib/ratelimiter.js
b/node_modules/service-runner/lib/ratelimiter.js
index 6a681b3..15c89bc 100644
--- a/node_modules/service-runner/lib/ratelimiter.js
+++ b/node_modules/service-runner/lib/ratelimiter.js
@@ -113,6 +113,20 @@
}
};
+/**
+ * Checks whether we're above the limit without updating the counters.
+ *
+ * @param {string} key
+ * @param {number} limit
+ */
+RateLimiterWorker.prototype.checkAboveLimit = function(key, limit) {
+ if (this._blocks[key]) {
+ return this._blocks[key].value > limit;
+ } else {
+ return false;
+ }
+};
+
module.exports = {
master: RateLimiterMaster,
worker: RateLimiterWorker,
diff --git
a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
index a9da3c8..eb75527 100644
---
a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
+++
b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
@@ -75,7 +75,7 @@
},
"homepage": "https://github.com/kadtools/kad#readme";,
"_id": "kad@1.3.6",
- "_shasum": "9ba5e7a22f21f7b66002786526c31458f9d5fd17",
+ "_shasum": "a6964d7083812bee7e18d7ee8273f664ae6f020b",
"_from": "git+https://github.com/gwicke/kad.git#master";,
"_resolved":
"git+https://github.com/gwicke/kad.git#f35971036f43814043245da82b12d035b7bbfd16";
}
diff --git a/node_modules/service-runner/package.json
b/node_modules/service-runner/package.json
index f693e9a..166e73b 100644
--- a/node_modules/service-runner/package.json
+++ b/node_modules/service-runner/package.json
@@ -1,6 +1,6 @@
{
"name": "service-runner",
- "version": "2.1.1",
+ "version": "2.1.2",
"description": "Generic nodejs service supervisor / cluster runner",
"main": "service-runner.js",
"bin": {
@@ -47,19 +47,19 @@
"mocha-jscs": "^5.0.1",
"bunyan-prettystream":
"git+https://github.com/hadfieldn/node-bunyan-prettystream.git#master";
},
- "gitHead": "1674be5ee0d9fd4cacd693ab9267ba880269749d",
- "_id": "service-runner@2.1.1",
- "_shasum": "bb99dc7b9b2b1e95bef56774722fda9755f80143",
+ "gitHead": "2717b345bc7a51123b68ee8c21c9887e888cfb27",
+ "_id": "service-runner@2.1.2",
+ "_shasum": "8a3c00dbabb4b969dbf379f8ed9ffa1e35a3e591",
"_from": "service-runner@>=2.1.1 <3.0.0",
- "_npmVersion": "2.15.8",
- "_nodeVersion": "4.4.7",
+ "_npmVersion": "2.15.5",
+ "_nodeVersion": "4.4.6",
"_npmUser": {
- "name": "pchelolo",
- "email": "petrpche...@gmail.com"
+ "name": "doorman",
+ "email": "marko.obro...@gmail.com"
},
"dist": {
- "shasum": "bb99dc7b9b2b1e95bef56774722fda9755f80143",
- "tarball":
"https://registry.npmjs.org/service-runner/-/service-runner-2.1.1.tgz";
+ "shasum": "8a3c00dbabb4b969dbf379f8ed9ffa1e35a3e591",
+ "tarball":
"https://registry.npmjs.org/service-runner/-/service-runner-2.1.2.tgz";
},
"maintainers": [
{
@@ -76,9 +76,9 @@
}
],
"_npmOperationalInternal": {
- "host": "packages-16-east.internal.npmjs.com",
- "tmp": "tmp/service-runner-2.1.1.tgz_1473446431473_0.644707161700353"
+ "host": "packages-12-west.internal.npmjs.com",
+ "tmp": "tmp/service-runner-2.1.2.tgz_1473714027610_0.9398095468059182"
},
"directories": {},
- "_resolved":
"https://registry.npmjs.org/service-runner/-/service-runner-2.1.1.tgz";
+ "_resolved":
"https://registry.npmjs.org/service-runner/-/service-runner-2.1.2.tgz";
}
diff --git a/src b/src
index fa24064..58b4a2b 160000
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit fa240648f1c6c807546bef991a33f2e9217bcf97
+Subproject commit 58b4a2bc0e9fdc8d3fb4d550fae731fc7ee5f772
--
To view, visit https://gerrit.wikimedia.org/r/310333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If0eac9bf776cddd048a2ae319575a64a11cf466c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
