Mobrovac has submitted this change and it was merged. Change subject: Update restbase to a684d44 ......................................................................
Update restbase to a684d44 List of changes: 25a99b4 update service-runner to 0.2.8 xxxxxxx Update node module dependencies Change-Id: I9fb30e9e70ab360f73cfe378ad5cf6538f75cbf7 --- M node_modules/js-yaml/node_modules/argparse/package.json M node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/inherits/package.json M node_modules/jsonwebtoken/node_modules/jws/node_modules/jwa/node_modules/ecdsa-sig-formatter/node_modules/asn1.js/node_modules/inherits/package.json M node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/inherits/package.json M node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json M node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json M node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/core-js/package.json M node_modules/service-runner/lib/base_service.js M node_modules/service-runner/node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/package.json M node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/right-align/node_modules/align-text/package.json M node_modules/service-runner/package.json M node_modules/swagger-router/node_modules/js-yaml/node_modules/argparse/package.json M src 13 files changed, 29 insertions(+), 22 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/node_modules/js-yaml/node_modules/argparse/package.json b/node_modules/js-yaml/node_modules/argparse/package.json index 959b779..4ff4f69 100644 --- a/node_modules/js-yaml/node_modules/argparse/package.json +++ b/node_modules/js-yaml/node_modules/argparse/package.json @@ -40,7 +40,7 @@ "gitHead": "990f1b5332e70dd3c1c437d2f4077a2b63ac9674", "_id": "[email protected]", "_shasum": "bcfae39059656d1973d0b9e6a1a74154b5a9a136", - "_from": "argparse@~ 1.0.0", + "_from": "argparse@~1.0.2", "_npmVersion": "1.4.28", "_npmUser": { "name": "vitaly", diff --git a/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/inherits/package.json b/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/inherits/package.json index 420a206..292dc68 100644 --- a/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/inherits/package.json +++ b/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/inherits/package.json @@ -30,7 +30,7 @@ "shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1", "tarball": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; }, - "_from": "inherits@^2.0.1", + "_from": "inherits@~2.0.1", "_npmVersion": "1.3.8", "_npmUser": { "name": "isaacs", diff --git a/node_modules/jsonwebtoken/node_modules/jws/node_modules/jwa/node_modules/ecdsa-sig-formatter/node_modules/asn1.js/node_modules/inherits/package.json b/node_modules/jsonwebtoken/node_modules/jws/node_modules/jwa/node_modules/ecdsa-sig-formatter/node_modules/asn1.js/node_modules/inherits/package.json index 2ae619b..420a206 100644 --- a/node_modules/jsonwebtoken/node_modules/jws/node_modules/jwa/node_modules/ecdsa-sig-formatter/node_modules/asn1.js/node_modules/inherits/package.json +++ b/node_modules/jsonwebtoken/node_modules/jws/node_modules/jwa/node_modules/ecdsa-sig-formatter/node_modules/asn1.js/node_modules/inherits/package.json @@ -30,7 +30,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/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/inherits/package.json b/node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/inherits/package.json index 75ae68e..292dc68 100644 --- a/node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/inherits/package.json +++ b/node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/inherits/package.json @@ -44,5 +44,6 @@ ], "directories": {}, "_shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1", - "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json b/node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json index 85aec01..19228ab 100644 --- a/node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json +++ b/node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json @@ -45,5 +45,9 @@ ], "directories": {}, "_shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf", - "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";, + "bugs": { + "url": "https://github.com/juliangruber/isarray/issues"; + }, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json b/node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json index 379f735..a8c586b 100644 --- a/node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json +++ b/node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json @@ -49,5 +49,6 @@ "tarball": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; }, "directories": {}, - "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/core-js/package.json b/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/core-js/package.json index 04953c7..6eb9115 100644 --- a/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/core-js/package.json +++ b/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/core-js/package.json @@ -81,5 +81,6 @@ "tarball": "http://registry.npmjs.org/core-js/-/core-js-0.9.18.tgz"; }, "directories": {}, - "_resolved": "https://registry.npmjs.org/core-js/-/core-js-0.9.18.tgz"; + "_resolved": "https://registry.npmjs.org/core-js/-/core-js-0.9.18.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/service-runner/lib/base_service.js b/node_modules/service-runner/lib/base_service.js index 41f2fc0..dd894d6 100644 --- a/node_modules/service-runner/lib/base_service.js +++ b/node_modules/service-runner/lib/base_service.js @@ -184,7 +184,7 @@ } else if (conf && typeof conf === 'string') { // Yaml source provided as config string action = P.try(function() { - return yaml.safeLoad(conf); + return yaml.load(conf); }); } else { // No config provided - load from file and parse yaml. @@ -195,7 +195,7 @@ } action = fs.readFileAsync(configFile) .then(function(yamlSource) { - return yaml.safeLoad(yamlSource); + return yaml.load(yamlSource); }); } diff --git a/node_modules/service-runner/node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/package.json b/node_modules/service-runner/node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/package.json index 2ae619b..420a206 100644 --- a/node_modules/service-runner/node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/package.json +++ b/node_modules/service-runner/node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/package.json @@ -30,7 +30,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/service-runner/node_modules/yargs/node_modules/cliui/node_modules/right-align/node_modules/align-text/package.json b/node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/right-align/node_modules/align-text/package.json index 13b5032..a810bd6 100644 --- a/node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/right-align/node_modules/align-text/package.json +++ b/node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/right-align/node_modules/align-text/package.json @@ -52,7 +52,7 @@ "gitHead": "11c2e834ff2c63f9844bddf189fea5cab921e44d", "_id": "[email protected]", "_shasum": "72db3983872eec2313919c9426a993a41afe93f7", - "_from": "align-text@^0.1.1", + "_from": "align-text@^0.1.0", "_npmVersion": "2.10.1", "_nodeVersion": "0.12.4", "_npmUser": { @@ -70,6 +70,5 @@ "tarball": "http://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz"; }, "directories": {}, - "_resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz";, - "readme": "ERROR: No README data found!" + "_resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz"; } diff --git a/node_modules/service-runner/package.json b/node_modules/service-runner/package.json index d6c6db8..5de9a35 100644 --- a/node_modules/service-runner/package.json +++ b/node_modules/service-runner/package.json @@ -1,6 +1,6 @@ { "name": "service-runner", - "version": "0.2.8", + "version": "0.2.9", "description": "Generic nodejs service supervisor / cluster runner", "main": "service-runner.js", "bin": { @@ -46,10 +46,10 @@ "mocha-jshint": "^2.2.3", "mocha-jscs": "^1.2.0" }, - "gitHead": "ba00eb2adbe958c3b583961201189e513c3e98ef", - "_id": "[email protected]", - "_shasum": "c7342205b1b806cf9826b98eefd8a5b242fdc95d", - "_from": "service-runner@^0.2.5", + "gitHead": "25a464508ee7b59d37b76ed9b792373962e74817", + "_id": "[email protected]", + "_shasum": "a8c9b4d0bae242c549e1ecc917e6293f6ed352b6", + "_from": "service-runner@^0.2.8", "_npmVersion": "2.13.2", "_nodeVersion": "2.5.0", "_npmUser": { @@ -67,9 +67,9 @@ } ], "dist": { - "shasum": "c7342205b1b806cf9826b98eefd8a5b242fdc95d", - "tarball": "http://registry.npmjs.org/service-runner/-/service-runner-0.2.8.tgz"; + "shasum": "a8c9b4d0bae242c549e1ecc917e6293f6ed352b6", + "tarball": "http://registry.npmjs.org/service-runner/-/service-runner-0.2.9.tgz"; }, "directories": {}, - "_resolved": "https://registry.npmjs.org/service-runner/-/service-runner-0.2.8.tgz"; + "_resolved": "https://registry.npmjs.org/service-runner/-/service-runner-0.2.9.tgz"; } diff --git a/node_modules/swagger-router/node_modules/js-yaml/node_modules/argparse/package.json b/node_modules/swagger-router/node_modules/js-yaml/node_modules/argparse/package.json index 959b779..e49f578 100644 --- a/node_modules/swagger-router/node_modules/js-yaml/node_modules/argparse/package.json +++ b/node_modules/swagger-router/node_modules/js-yaml/node_modules/argparse/package.json @@ -57,5 +57,6 @@ "tarball": "http://registry.npmjs.org/argparse/-/argparse-1.0.2.tgz"; }, "directories": {}, - "_resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.2.tgz"; + "_resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.2.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/src b/src index 176eebd..a684d44 160000 --- a/src +++ b/src -Subproject commit 176eebd695452bcfdcd3a27a90b54711359dc702 +Subproject commit a684d44e2a4ac03838bc5bb479035b39fef29562 -- To view, visit https://gerrit.wikimedia.org/r/243356 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9fb30e9e70ab360f73cfe378ad5cf6538f75cbf7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/aqs/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac <[email protected]> Gerrit-Reviewer: Eevans <[email protected]> Gerrit-Reviewer: GWicke <[email protected]> Gerrit-Reviewer: Mobrovac <[email protected]> Gerrit-Reviewer: Ottomata <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
