jenkins-bot has submitted this change and it was merged. Change subject: Update mobileapps to 04a6e84 ......................................................................
Update mobileapps to 04a6e84 List of changes: 297f302 Remove mobile-summary endpoint b961452 Revert "Revert "Update to service-template-node v0.5.0 (minus eslint)"" 04a6e84 Skipping 2 tests for hatnotes in the experimental endpoints xxxxxxx Update node module dependencies Change-Id: I4fbddd4a6c6b8fea8c47fe5ddd3ab579e092ed02 --- A node_modules/.bin/semver M node_modules/bunyan/package.json M node_modules/heapdump/build/Makefile M node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d M node_modules/heapdump/build/addon.target.mk M node_modules/heapdump/build/config.gypi M node_modules/js-yaml/package.json M node_modules/preq/.travis.yml M node_modules/preq/index.js A node_modules/preq/node_modules/.bin/semver M node_modules/preq/package.json R node_modules/semver/LICENSE R node_modules/semver/bin/semver R node_modules/semver/package.json R node_modules/semver/range.bnf R node_modules/semver/semver.js M node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json M node_modules/service-runner/package.json M node_modules/swagger-router/package.json M src 20 files changed, 126 insertions(+), 101 deletions(-) Approvals: Mholloway: Looks good to me, approved jenkins-bot: Verified diff --git a/node_modules/.bin/semver b/node_modules/.bin/semver new file mode 120000 index 0000000..317eb29 --- /dev/null +++ b/node_modules/.bin/semver @@ -0,0 +1 @@ +../semver/bin/semver \ No newline at end of file diff --git a/node_modules/bunyan/package.json b/node_modules/bunyan/package.json index 07bc907..2572b72 100644 --- a/node_modules/bunyan/package.json +++ b/node_modules/bunyan/package.json @@ -213,7 +213,7 @@ "homepage": "https://github.com/trentm/node-bunyan#readme";, "_id": "bunyan@1.8.5", "_shasum": "0d619e83005fb89070f5f47982fc1bf00600878a", - "_from": "bunyan@>=1.8.3 <2.0.0", + "_from": "bunyan@>=1.8.5 <2.0.0", "_npmVersion": "2.15.9", "_nodeVersion": "4.6.1", "_npmUser": { diff --git a/node_modules/heapdump/build/Makefile b/node_modules/heapdump/build/Makefile index 285e8ee..c9d9d51 100644 --- a/node_modules/heapdump/build/Makefile +++ b/node_modules/heapdump/build/Makefile @@ -308,8 +308,8 @@ endif quiet_cmd_regen_makefile = ACTION Regenerating $@ -cmd_regen_makefile = cd $(srcdir); /usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/opt/service/node_modules/heapdump/build/config.gypi -I/usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/root/.node-gyp/4.6.0/include/node/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/root/.node-gyp/4.6.0" "-Dnode_gyp_dir=/usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=node.lib" "-Dmodule_root_dir=/opt/service/node_modules/heapdump" binding.gyp -Makefile: $(srcdir)/../../../../usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp $(srcdir)/../../../../root/.node-gyp/4.6.0/include/node/common.gypi +cmd_regen_makefile = cd $(srcdir); /usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/opt/service/node_modules/heapdump/build/config.gypi -I/usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/home/runuser/.node-gyp/4.6.0/include/node/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/home/runuser/.node-gyp/4.6.0" "-Dnode_gyp_dir=/usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=node.lib" "-Dmodule_root_dir=/opt/service/node_modules/heapdump" binding.gyp +Makefile: $(srcdir)/../../../../home/runuser/.node-gyp/4.6.0/include/node/common.gypi $(srcdir)/../../../../usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp $(call do_cmd,regen_makefile) # "all" is a concatenation of the "all" targets from all the included diff --git a/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d b/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d index 022660f..9af41a7 100644 --- a/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d +++ b/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d @@ -1,34 +1,36 @@ -cmd_Release/obj.target/addon/src/heapdump.o := g++ '-DNODE_GYP_MODULE_NAME=addon' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/root/.node-gyp/4.6.0/include/node -I/root/.node-gyp/4.6.0/src -I/root/.node-gyp/4.6.0/deps/uv/include -I/root/.node-gyp/4.6.0/deps/v8/include -fPIC -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -ffunction-sections -fdata-sections -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++0x -MMD -MF ./Release/.deps/Release/obj.target/addon/src/heapdump.o.d.raw -c -o Release/obj.target/addon/src/heapdump.o ../src/heapdump.cc +cmd_Release/obj.target/addon/src/heapdump.o := g++ '-DNODE_GYP_MODULE_NAME=addon' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/home/runuser/.node-gyp/4.6.0/include/node -I/home/runuser/.node-gyp/4.6.0/src -I/home/runuser/.node-gyp/4.6.0/deps/uv/include -I/home/runuser/.node-gyp/4.6.0/deps/v8/include -fPIC -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -ffunction-sections -fdata-sections -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++0x -MMD -MF ./Release/.deps/Release/obj.target/addon/src/heapdump.o.d.raw -c -o Release/obj.target/addon/src/heapdump.o ../src/heapdump.cc Release/obj.target/addon/src/heapdump.o: ../src/heapdump.cc \ - /root/.node-gyp/4.6.0/include/node/node.h \ - /root/.node-gyp/4.6.0/include/node/v8.h \ - /root/.node-gyp/4.6.0/include/node/v8-version.h \ - /root/.node-gyp/4.6.0/include/node/v8config.h \ - /root/.node-gyp/4.6.0/include/node/node_version.h ../src/compat-inl.h \ - ../src/compat.h /root/.node-gyp/4.6.0/include/node/node_version.h \ - /root/.node-gyp/4.6.0/include/node/v8.h \ - /root/.node-gyp/4.6.0/include/node/v8-profiler.h \ - /root/.node-gyp/4.6.0/include/node/uv.h \ - /root/.node-gyp/4.6.0/include/node/uv-errno.h \ - /root/.node-gyp/4.6.0/include/node/uv-version.h \ - /root/.node-gyp/4.6.0/include/node/uv-unix.h \ - /root/.node-gyp/4.6.0/include/node/uv-threadpool.h \ - /root/.node-gyp/4.6.0/include/node/uv-linux.h ../src/heapdump-posix.h + /home/runuser/.node-gyp/4.6.0/include/node/node.h \ + /home/runuser/.node-gyp/4.6.0/include/node/v8.h \ + /home/runuser/.node-gyp/4.6.0/include/node/v8-version.h \ + /home/runuser/.node-gyp/4.6.0/include/node/v8config.h \ + /home/runuser/.node-gyp/4.6.0/include/node/node_version.h \ + ../src/compat-inl.h ../src/compat.h \ + /home/runuser/.node-gyp/4.6.0/include/node/node_version.h \ + /home/runuser/.node-gyp/4.6.0/include/node/v8.h \ + /home/runuser/.node-gyp/4.6.0/include/node/v8-profiler.h \ + /home/runuser/.node-gyp/4.6.0/include/node/uv.h \ + /home/runuser/.node-gyp/4.6.0/include/node/uv-errno.h \ + /home/runuser/.node-gyp/4.6.0/include/node/uv-version.h \ + /home/runuser/.node-gyp/4.6.0/include/node/uv-unix.h \ + /home/runuser/.node-gyp/4.6.0/include/node/uv-threadpool.h \ + /home/runuser/.node-gyp/4.6.0/include/node/uv-linux.h \ + ../src/heapdump-posix.h ../src/heapdump.cc: -/root/.node-gyp/4.6.0/include/node/node.h: -/root/.node-gyp/4.6.0/include/node/v8.h: -/root/.node-gyp/4.6.0/include/node/v8-version.h: -/root/.node-gyp/4.6.0/include/node/v8config.h: -/root/.node-gyp/4.6.0/include/node/node_version.h: +/home/runuser/.node-gyp/4.6.0/include/node/node.h: +/home/runuser/.node-gyp/4.6.0/include/node/v8.h: +/home/runuser/.node-gyp/4.6.0/include/node/v8-version.h: +/home/runuser/.node-gyp/4.6.0/include/node/v8config.h: +/home/runuser/.node-gyp/4.6.0/include/node/node_version.h: ../src/compat-inl.h: ../src/compat.h: -/root/.node-gyp/4.6.0/include/node/node_version.h: -/root/.node-gyp/4.6.0/include/node/v8.h: -/root/.node-gyp/4.6.0/include/node/v8-profiler.h: -/root/.node-gyp/4.6.0/include/node/uv.h: -/root/.node-gyp/4.6.0/include/node/uv-errno.h: -/root/.node-gyp/4.6.0/include/node/uv-version.h: -/root/.node-gyp/4.6.0/include/node/uv-unix.h: -/root/.node-gyp/4.6.0/include/node/uv-threadpool.h: -/root/.node-gyp/4.6.0/include/node/uv-linux.h: +/home/runuser/.node-gyp/4.6.0/include/node/node_version.h: +/home/runuser/.node-gyp/4.6.0/include/node/v8.h: +/home/runuser/.node-gyp/4.6.0/include/node/v8-profiler.h: +/home/runuser/.node-gyp/4.6.0/include/node/uv.h: +/home/runuser/.node-gyp/4.6.0/include/node/uv-errno.h: +/home/runuser/.node-gyp/4.6.0/include/node/uv-version.h: +/home/runuser/.node-gyp/4.6.0/include/node/uv-unix.h: +/home/runuser/.node-gyp/4.6.0/include/node/uv-threadpool.h: +/home/runuser/.node-gyp/4.6.0/include/node/uv-linux.h: ../src/heapdump-posix.h: diff --git a/node_modules/heapdump/build/addon.target.mk b/node_modules/heapdump/build/addon.target.mk index 5fd4df9..8f21dcd 100644 --- a/node_modules/heapdump/build/addon.target.mk +++ b/node_modules/heapdump/build/addon.target.mk @@ -34,10 +34,10 @@ -std=gnu++0x INCS_Debug := \ - -I/root/.node-gyp/4.6.0/include/node \ - -I/root/.node-gyp/4.6.0/src \ - -I/root/.node-gyp/4.6.0/deps/uv/include \ - -I/root/.node-gyp/4.6.0/deps/v8/include + -I/home/runuser/.node-gyp/4.6.0/include/node \ + -I/home/runuser/.node-gyp/4.6.0/src \ + -I/home/runuser/.node-gyp/4.6.0/deps/uv/include \ + -I/home/runuser/.node-gyp/4.6.0/deps/v8/include DEFS_Release := \ '-DNODE_GYP_MODULE_NAME=addon' \ @@ -71,10 +71,10 @@ -std=gnu++0x INCS_Release := \ - -I/root/.node-gyp/4.6.0/include/node \ - -I/root/.node-gyp/4.6.0/src \ - -I/root/.node-gyp/4.6.0/deps/uv/include \ - -I/root/.node-gyp/4.6.0/deps/v8/include + -I/home/runuser/.node-gyp/4.6.0/include/node \ + -I/home/runuser/.node-gyp/4.6.0/src \ + -I/home/runuser/.node-gyp/4.6.0/deps/uv/include \ + -I/home/runuser/.node-gyp/4.6.0/deps/v8/include OBJS := \ $(obj).target/$(TARGET)/src/heapdump.o diff --git a/node_modules/heapdump/build/config.gypi b/node_modules/heapdump/build/config.gypi index 29fd30a..fd4c1dc 100644 --- a/node_modules/heapdump/build/config.gypi +++ b/node_modules/heapdump/build/config.gypi @@ -46,7 +46,7 @@ "v8_random_seed": 0, "v8_use_snapshot": "true", "want_separate_host_toolset": 0, - "nodedir": "/root/.node-gyp/4.6.0", + "nodedir": "/home/runuser/.node-gyp/4.6.0", "copy_dev_lib": "true", "standalone_static_library": 1, "cache_lock_stale": "60000", @@ -68,7 +68,7 @@ "rollback": "true", "tag_version_prefix": "v", "cache_max": "Infinity", - "userconfig": "/root/.npmrc", + "userconfig": "/home/runuser/.npmrc", "engine_strict": "", "init_author_name": "", "init_author_url": "", @@ -89,7 +89,7 @@ "scope": "", "searchopts": "", "versions": "", - "cache": "/root/.npm", + "cache": "/home/runuser/.npm", "ignore_scripts": "", "searchsort": "name", "version": "", @@ -110,7 +110,7 @@ "unicode": "true", "long": "", "production": "", - "unsafe_perm": "", + "unsafe_perm": "true", "node_version": "4.6.0", "tag": "latest", "git_tag_version": "true", @@ -122,12 +122,12 @@ "strict_ssl": "true", "dev": "", "globalconfig": "/usr/local/nvm/versions/node/v4.6.0/etc/npmrc", - "init_module": "/root/.npm-init.js", + "init_module": "/home/runuser/.npm-init.js", "parseable": "", "globalignorefile": "/usr/local/nvm/versions/node/v4.6.0/etc/npmignore", "cache_lock_retries": "10", "save_prefix": "^", - "group": "", + "group": "1000", "init_author_email": "", "searchexclude": "", "git": "git", diff --git a/node_modules/js-yaml/package.json b/node_modules/js-yaml/package.json index daa43a6..bb3fd51 100644 --- a/node_modules/js-yaml/package.json +++ b/node_modules/js-yaml/package.json @@ -67,7 +67,7 @@ }, "_id": "js-yaml@3.7.0", "_shasum": "5c967ddd837a9bfdca5f2de84253abe8a1c03b80", - "_from": "js-yaml@>=3.6.1 <4.0.0", + "_from": "js-yaml@>=3.7.0 <4.0.0", "_npmVersion": "3.10.8", "_nodeVersion": "6.8.1", "_npmUser": { diff --git a/node_modules/preq/.travis.yml b/node_modules/preq/.travis.yml index 47f2d25..98690db 100644 --- a/node_modules/preq/.travis.yml +++ b/node_modules/preq/.travis.yml @@ -1,7 +1,6 @@ language: node_js node_js: - "0.10" - - "0.11" - - "0.12" - - "iojs" + - "4" + - "6" diff --git a/node_modules/preq/index.js b/node_modules/preq/index.js index 501733a..0dc2de5 100644 --- a/node_modules/preq/index.js +++ b/node_modules/preq/index.js @@ -4,8 +4,9 @@ var url = require('url'); var util = require('util'); var querystring = require('querystring'); +var semver = require('semver'); -function setupConnectionTimeout(protocol) { +function createConnectTimeoutAgent(protocol) { var http = require(protocol); var Agent = http.Agent; @@ -15,38 +16,55 @@ } util.inherits(ConnectTimeoutAgent, Agent); - ConnectTimeoutAgent.prototype.createSocket = function() { - var s = Agent.prototype.createSocket.apply(this, arguments); - // Set up a connect timeout if connectTimeout option is set - if (this.options.connectTimeout && !s.connectTimeoutTimer) { - s.connectTimeoutTimer = setTimeout(function() { + if (semver.gte(process.version, '5.7.0')) { + ConnectTimeoutAgent.prototype.createSocket = function(req, options, cb) { + var connectTimeoutTimer = setTimeout(function() { var e = new Error('ETIMEDOUT'); e.code = 'ETIMEDOUT'; - s.end(); - s.emit('error', e); - s.destroy(); + cb(e); }, this.options.connectTimeout); - s.once('connect', function() { - if (this.connectTimeoutTimer) { - clearTimeout(this.connectTimeoutTimer); - this.connectTimeoutTimer = undefined; - } - }); - } - return s; - }; - - http.globalAgent = new ConnectTimeoutAgent({ - connectTimeout: 5 * 1000, - // Setting this too high (especially 'Infinity') leads to high - // (hundreds of mb) memory usage in the agent under sustained request - // workloads. 250 should be a reasonable upper bound for practical - // applications. - maxSockets: 250 - }); + Agent.prototype.createSocket.apply(this, [req, options, function(error, newSocket) { + newSocket.on('connect', function() { + clearTimeout(connectTimeoutTimer); + }); + cb(error, newSocket); + }]); + }; + } else { + ConnectTimeoutAgent.prototype.createSocket = function() { + var s = Agent.prototype.createSocket.apply(this, arguments); + // Set up a connect timeout if connectTimeout option is set + if (this.options.connectTimeout && !s.connectTimeoutTimer) { + s.connectTimeoutTimer = setTimeout(function () { + var e = new Error('ETIMEDOUT'); + e.code = 'ETIMEDOUT'; + s.end(); + s.emit('error', e); + s.destroy(); + }, this.options.connectTimeout); + s.once('connect', function () { + if (this.connectTimeoutTimer) { + clearTimeout(this.connectTimeoutTimer); + this.connectTimeoutTimer = undefined; + } + }); + } + return s; + }; + } + return ConnectTimeoutAgent; } -setupConnectionTimeout('http'); -setupConnectionTimeout('https'); + +var agentOptions = { + connectTimeout: 5 * 1000, + // Setting this too high (especially 'Infinity') leads to high + // (hundreds of mb) memory usage in the agent under sustained request + // workloads. 250 should be a reasonable upper bound for practical + // applications. + maxSockets: 250 +}; +var httpAgentClass = createConnectTimeoutAgent('http'); +var httpsAgentClass = createConnectTimeoutAgent('https'); var request = P.promisify(require('request'), { multiArgs: true }); @@ -106,6 +124,9 @@ o._encodingProvided = true; } + o.agentClass = /^https/.test(o.uri) ? httpsAgentClass : httpAgentClass; + o.agentOptions = agentOptions; + return o; } diff --git a/node_modules/preq/node_modules/.bin/semver b/node_modules/preq/node_modules/.bin/semver new file mode 120000 index 0000000..317eb29 --- /dev/null +++ b/node_modules/preq/node_modules/.bin/semver @@ -0,0 +1 @@ +../semver/bin/semver \ No newline at end of file diff --git a/node_modules/preq/package.json b/node_modules/preq/package.json index 23799e2..e26fce6 100644 --- a/node_modules/preq/package.json +++ b/node_modules/preq/package.json @@ -1,6 +1,6 @@ { "name": "preq", - "version": "0.4.12", + "version": "0.5.0", "description": "Yet another promising request wrapper", "main": "index.js", "scripts": { @@ -13,7 +13,8 @@ "license": "MIT", "dependencies": { "bluebird": "^3.1.1", - "request": "^2.67.0" + "request": "^2.67.0", + "semver": "^5.3.0" }, "devDependencies": { "mocha": "^2.3.4" @@ -23,22 +24,17 @@ "url": "git://github.com/wikimedia/preq.git" }, "homepage": "https://github.com/wikimedia/preq";, - "gitHead": "1c2f6b909dad53cf7123fb224b68deb60f6477f5", + "gitHead": "8fd7fff75ba26191a102ccf2b8d12f45d7c6e5c2", "bugs": { "url": "https://github.com/wikimedia/preq/issues"; }, - "_id": "preq@0.4.12", - "_shasum": "4056595182ed395aefa2e7595f6f2038bb6fa0c5", - "_from": "preq@>=0.4.12 <0.5.0", - "_npmVersion": "2.15.9", - "_nodeVersion": "4.6.0", + "_id": "preq@0.5.0", + "_shasum": "ae246305085fd077e2dd15668720c39f81ce8d46", + "_from": "preq@>=0.5.0 <0.6.0", + "_npmVersion": "1.4.21", "_npmUser": { - "name": "pchelolo", - "email": "petrpche...@gmail.com" - }, - "dist": { - "shasum": "4056595182ed395aefa2e7595f6f2038bb6fa0c5", - "tarball": "https://registry.npmjs.org/preq/-/preq-0.4.12.tgz"; + "name": "gwicke", + "email": "gabr...@gwicke.net" }, "maintainers": [ { @@ -54,10 +50,14 @@ "email": "petrpche...@gmail.com" } ], + "dist": { + "shasum": "ae246305085fd077e2dd15668720c39f81ce8d46", + "tarball": "https://registry.npmjs.org/preq/-/preq-0.5.0.tgz"; + }, "_npmOperationalInternal": { "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/preq-0.4.12.tgz_1476834114417_0.39123208122327924" + "tmp": "tmp/preq-0.5.0.tgz_1478878812100_0.4030860348138958" }, "directories": {}, - "_resolved": "https://registry.npmjs.org/preq/-/preq-0.4.12.tgz"; + "_resolved": "https://registry.npmjs.org/preq/-/preq-0.5.0.tgz"; } diff --git a/node_modules/service-runner/node_modules/semver/LICENSE b/node_modules/semver/LICENSE similarity index 100% rename from node_modules/service-runner/node_modules/semver/LICENSE rename to node_modules/semver/LICENSE diff --git a/node_modules/service-runner/node_modules/semver/bin/semver b/node_modules/semver/bin/semver similarity index 100% rename from node_modules/service-runner/node_modules/semver/bin/semver rename to node_modules/semver/bin/semver diff --git a/node_modules/service-runner/node_modules/semver/package.json b/node_modules/semver/package.json similarity index 94% rename from node_modules/service-runner/node_modules/semver/package.json rename to node_modules/semver/package.json index 4a095d8..3ac906a 100644 --- a/node_modules/service-runner/node_modules/semver/package.json +++ b/node_modules/semver/package.json @@ -29,7 +29,7 @@ "homepage": "https://github.com/npm/node-semver#readme";, "_id": "semver@5.3.0", "_shasum": "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f", - "_from": "semver@>=5.3.0 <6.0.0", + "_from": "semver@5.3.0", "_npmVersion": "3.10.6", "_nodeVersion": "4.4.4", "_npmUser": { @@ -55,5 +55,6 @@ "tmp": "tmp/semver-5.3.0.tgz_1468515166602_0.9155273644719273" }, "directories": {}, - "_resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + "_resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/service-runner/node_modules/semver/range.bnf b/node_modules/semver/range.bnf similarity index 100% rename from node_modules/service-runner/node_modules/semver/range.bnf rename to node_modules/semver/range.bnf diff --git a/node_modules/service-runner/node_modules/semver/semver.js b/node_modules/semver/semver.js similarity index 100% rename from node_modules/service-runner/node_modules/semver/semver.js rename to node_modules/semver/semver.js 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 103c508..27574d1 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": "c055476df2ea6c6ed9b84f9e41b600fc500571e0", + "_shasum": "d4545f700799417800b681f6e4eef584340b9693", "_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 349996d..53ba082 100644 --- a/node_modules/service-runner/package.json +++ b/node_modules/service-runner/package.json @@ -51,7 +51,7 @@ "gitHead": "a235e2f8460625cb5ee8fc64cc3071a5a070e063", "_id": "service-runner@2.1.11", "_shasum": "1b0c83666beef6cc0637f0573a5107d107eac5bb", - "_from": "service-runner@>=2.1.7 <3.0.0", + "_from": "service-runner@>=2.1.11 <3.0.0", "_npmVersion": "2.15.9", "_nodeVersion": "4.6.0", "_npmUser": { diff --git a/node_modules/swagger-router/package.json b/node_modules/swagger-router/package.json index 1d3b7d1..0147a2f 100644 --- a/node_modules/swagger-router/package.json +++ b/node_modules/swagger-router/package.json @@ -62,7 +62,7 @@ "homepage": "https://github.com/wikimedia/swagger-router#readme";, "_id": "swagger-router@0.5.5", "_shasum": "f6a059325feccef69353ba6c9a6523a26f1867d7", - "_from": "swagger-router@>=0.5.2 <0.6.0", + "_from": "swagger-router@>=0.5.5 <0.6.0", "_npmVersion": "2.15.9", "_nodeVersion": "4.6.0", "_npmUser": { diff --git a/src b/src index 14deac7..04a6e84 160000 --- a/src +++ b/src @@ -1 +1 @@ -Subproject commit 14deac7288ea11e57d588790d38514268886bfec +Subproject commit 04a6e84612215efceccf726272fa5ffdaf746e65 -- To view, visit https://gerrit.wikimedia.org/r/324836 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4fbddd4a6c6b8fea8c47fe5ddd3ab579e092ed02 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mobileapps/deploy Gerrit-Branch: master Gerrit-Owner: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org> Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
