GWicke has submitted this change and it was merged.
Change subject: Update to latest master
......................................................................
Update to latest master
Change-Id: Ieb94a7269ce20603903f405c9e54e9b751a312e1
---
M
node_modules/busboy/node_modules/dicer/node_modules/readable-stream/node_modules/inherits/package.json
M
node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
M
node_modules/mocha-jshint/node_modules/jshint/node_modules/htmlparser2/node_modules/readable-stream/node_modules/inherits/package.json
M node_modules/mocha/node_modules/commander/package.json
M node_modules/mocha/node_modules/glob/node_modules/inherits/package.json
M node_modules/mocha/node_modules/jade/package.json
M node_modules/preq/index.js
M node_modules/preq/package.json
M node_modules/restbase-cassandra/node_modules/node-uuid/package.json
M restbase
10 files changed, 25 insertions(+), 31 deletions(-)
Approvals:
GWicke: Verified; Looks good to me, approved
diff --git
a/node_modules/busboy/node_modules/dicer/node_modules/readable-stream/node_modules/inherits/package.json
b/node_modules/busboy/node_modules/dicer/node_modules/readable-stream/node_modules/inherits/package.json
index 3d69f4f..754a114 100644
---
a/node_modules/busboy/node_modules/dicer/node_modules/readable-stream/node_modules/inherits/package.json
+++
b/node_modules/busboy/node_modules/dicer/node_modules/readable-stream/node_modules/inherits/package.json
@@ -32,7 +32,7 @@
"shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
"tarball": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
},
- "_from": "inherits@~2.0.1",
+ "_from": "inherits@2",
"_npmVersion": "1.3.8",
"_npmUser": {
"name": "isaacs",
diff --git
a/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
b/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
index 3d69f4f..754a114 100644
---
a/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
+++
b/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
@@ -32,7 +32,7 @@
"shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
"tarball": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
},
- "_from": "inherits@~2.0.1",
+ "_from": "inherits@2",
"_npmVersion": "1.3.8",
"_npmUser": {
"name": "isaacs",
diff --git
a/node_modules/mocha-jshint/node_modules/jshint/node_modules/htmlparser2/node_modules/readable-stream/node_modules/inherits/package.json
b/node_modules/mocha-jshint/node_modules/jshint/node_modules/htmlparser2/node_modules/readable-stream/node_modules/inherits/package.json
index 3d69f4f..754a114 100644
---
a/node_modules/mocha-jshint/node_modules/jshint/node_modules/htmlparser2/node_modules/readable-stream/node_modules/inherits/package.json
+++
b/node_modules/mocha-jshint/node_modules/jshint/node_modules/htmlparser2/node_modules/readable-stream/node_modules/inherits/package.json
@@ -32,7 +32,7 @@
"shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
"tarball": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
},
- "_from": "inherits@~2.0.1",
+ "_from": "inherits@2",
"_npmVersion": "1.3.8",
"_npmUser": {
"name": "isaacs",
diff --git a/node_modules/mocha/node_modules/commander/package.json
b/node_modules/mocha/node_modules/commander/package.json
index de917f5..f2b43dd 100644
--- a/node_modules/mocha/node_modules/commander/package.json
+++ b/node_modules/mocha/node_modules/commander/package.json
@@ -66,6 +66,5 @@
"tarball": "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz";,
- "readme": "ERROR: No README data found!"
+ "_resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
}
diff --git
a/node_modules/mocha/node_modules/glob/node_modules/inherits/package.json
b/node_modules/mocha/node_modules/glob/node_modules/inherits/package.json
index 754a114..3d69f4f 100644
--- a/node_modules/mocha/node_modules/glob/node_modules/inherits/package.json
+++ b/node_modules/mocha/node_modules/glob/node_modules/inherits/package.json
@@ -32,7 +32,7 @@
"shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
"tarball": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
},
- "_from": "inherits@2",
+ "_from": "inherits@~2.0.1",
"_npmVersion": "1.3.8",
"_npmUser": {
"name": "isaacs",
diff --git a/node_modules/mocha/node_modules/jade/package.json
b/node_modules/mocha/node_modules/jade/package.json
index 1c79f30..14198af 100644
--- a/node_modules/mocha/node_modules/jade/package.json
+++ b/node_modules/mocha/node_modules/jade/package.json
@@ -52,10 +52,5 @@
"directories": {},
"_shasum": "8f10d7977d8d79f2f6ff862a81b0513ccb25686c",
"_from": "[email protected]",
- "_resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz";,
- "bugs": {
- "url": "https://github.com/visionmedia/jade/issues";
- },
- "readme": "ERROR: No README data found!",
- "homepage": "https://github.com/visionmedia/jade";
+ "_resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
}
diff --git a/node_modules/preq/index.js b/node_modules/preq/index.js
index 5501472..b89157c 100644
--- a/node_modules/preq/index.js
+++ b/node_modules/preq/index.js
@@ -1,18 +1,13 @@
"use strict";
-var P = require('bluebird');
-var util = require('util');
-
-if (!Array.prototype.last) {
- Array.prototype.last = function() {
- return this[this.length - 1];
- };
+if (!global.Promise || !global.Promise.promisify) {
+ // Use promisify as a proxy for 'has modern promise implementation'
+ // Bluebird is faster than native promises in node 0.10 & 0.11, so
+ // normally use that.
+ global.Promise = require('bluebird');
}
-
+var util = require('util');
var req = require('request');
-
-// Increase the number of sockets per server
-require('http').globalAgent.maxSockets = 100;
function getOptions(uri, o, method) {
if (!o || o.constructor !== Object) {
@@ -49,6 +44,11 @@
if (o.timeout === undefined) {
o.timeout = 1 * 60 * 1000; // 1 minute
}
+
+ // Default pool options: Don't limit the number of sockets
+ if (!o.pool) {
+ o.pool = {maxSockets: Infinity};
+ }
return o;
}
@@ -72,7 +72,7 @@
function wrap(method) {
return function (url, options) {
options = getOptions(url, options, method);
- return new P(function(resolve, reject) {
+ return new Promise(function(resolve, reject) {
var retries = options.retries;
var delay = 50;
var cb = function(err, res) {
diff --git a/node_modules/preq/package.json b/node_modules/preq/package.json
index ced0419..6723f59 100644
--- a/node_modules/preq/package.json
+++ b/node_modules/preq/package.json
@@ -1,6 +1,6 @@
{
"name": "preq",
- "version": "0.2.10",
+ "version": "0.2.12",
"description": "Yet another promising request wrapper",
"main": "index.js",
"scripts": {
@@ -23,12 +23,12 @@
"url": "git://github.com/gwicke/preq.git"
},
"homepage": "https://github.com/gwicke/preq";,
- "gitHead": "fe3bd190bb116379a7aa0023670ff72df6c3ca6c",
+ "gitHead": "42451a426e1e8457e0fc359fb2cef35ccf751e36",
"bugs": {
"url": "https://github.com/gwicke/preq/issues";
},
"readme": "ERROR: No README data found!",
- "_id": "[email protected]",
- "_shasum": "ca3b125521bf49aa41ed2d5bc743b3a358cb851e",
- "_from": "preq@~0.2.8"
+ "_id": "[email protected]",
+ "_shasum": "251d4279949e5b17f319bc237391be5694d481ad",
+ "_from": "[email protected]"
}
diff --git
a/node_modules/restbase-cassandra/node_modules/node-uuid/package.json
b/node_modules/restbase-cassandra/node_modules/node-uuid/package.json
index e8670df..e60c8a1 100644
--- a/node_modules/restbase-cassandra/node_modules/node-uuid/package.json
+++ b/node_modules/restbase-cassandra/node_modules/node-uuid/package.json
@@ -51,6 +51,6 @@
},
"_id": "[email protected]",
"_shasum": "ef0686e625de814e821dc5a2b52d806271c3b7e4",
- "_resolved":
"git+https://github.com/gwicke/node-uuid.git#2c5dff86f3b40169bc1b6de68898cd4c78eb1dfd";,
- "_from": "git+https://github.com/gwicke/node-uuid.git#master";
+ "_resolved":
"git+https://github.com/gwicke/node-uuid#2c5dff86f3b40169bc1b6de68898cd4c78eb1dfd";,
+ "_from": "git+https://github.com/gwicke/node-uuid#master";
}
diff --git a/restbase b/restbase
index a48c262..d0a5b29 160000
--- a/restbase
+++ b/restbase
-Subproject commit a48c262d6f51d80268eeb78da0a218eff20d7579
+Subproject commit d0a5b292ddb711715b3f3a6a7f9ab9a387a047a5
--
To view, visit https://gerrit.wikimedia.org/r/179349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb94a7269ce20603903f405c9e54e9b751a312e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: GWicke <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
