Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/335673 )
Change subject: Update restbase to e628423
......................................................................
Update restbase to e628423
List of changes:
9d1daff Stop using deprecated ServiceRunner.run()
e628423 Revert "Abstracted the common feed functionality"
xxxxxxx Update node module dependencies
Change-Id: I1eb8cc3c75965b86921f1470efde1f842df89467
---
M node_modules/bcrypt-pbkdf/index.js
M node_modules/bcrypt-pbkdf/package.json
M node_modules/content-type/package.json
M node_modules/json-stable-stringify/package.json
M node_modules/kad/package.json
M node_modules/swagger-ui/package.json
M restbase
7 files changed, 30 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy
refs/changes/73/335673/1
diff --git a/node_modules/bcrypt-pbkdf/index.js
b/node_modules/bcrypt-pbkdf/index.js
index ea29aa9..b1b5ad4 100644
--- a/node_modules/bcrypt-pbkdf/index.js
+++ b/node_modules/bcrypt-pbkdf/index.js
@@ -29,10 +29,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
diff --git a/node_modules/bcrypt-pbkdf/package.json
b/node_modules/bcrypt-pbkdf/package.json
index b5d6352..0157b70 100644
--- a/node_modules/bcrypt-pbkdf/package.json
+++ b/node_modules/bcrypt-pbkdf/package.json
@@ -14,19 +14,19 @@
]
],
"_from": "bcrypt-pbkdf@>=1.0.0 <2.0.0",
- "_id": "bcrypt-pbkdf@1.0.0",
+ "_id": "bcrypt-pbkdf@1.0.1",
"_inCache": true,
"_location": "/bcrypt-pbkdf",
- "_nodeVersion": "0.12.15",
+ "_nodeVersion": "0.12.9",
"_npmOperationalInternal": {
- "host": "packages-16-east.internal.npmjs.com",
- "tmp": "tmp/bcrypt-pbkdf-1.0.0.tgz_1471381825814_0.06877309852279723"
+ "host": "packages-18-east.internal.npmjs.com",
+ "tmp": "tmp/bcrypt-pbkdf-1.0.1.tgz_1486007687899_0.974529881728813"
},
"_npmUser": {
"name": "arekinath",
"email": "a...@cooperi.net"
},
- "_npmVersion": "3.10.3",
+ "_npmVersion": "2.14.9",
"_phantomChildren": {},
"_requested": {
"raw": "bcrypt-pbkdf@^1.0.0",
@@ -40,8 +40,8 @@
"_requiredBy": [
"/sshpk"
],
- "_resolved":
"https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz";,
- "_shasum": "3ca76b85241c7170bf7d9703e7b9aa74630040d4",
+ "_resolved":
"https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";,
+ "_shasum": "63bc5dcb61331b92bc05fd528953c33462a06f8d",
"_shrinkwrap": null,
"_spec": "bcrypt-pbkdf@^1.0.0",
"_where": "/opt/service/node_modules/sshpk",
@@ -52,21 +52,33 @@
"devDependencies": {},
"directories": {},
"dist": {
- "shasum": "3ca76b85241c7170bf7d9703e7b9aa74630040d4",
- "tarball":
"https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz";
+ "shasum": "63bc5dcb61331b92bc05fd528953c33462a06f8d",
+ "tarball":
"https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
},
- "gitHead": "e88be37d3cd25395b4aa496ac468b33671368be6",
- "license": "BSD-4-Clause",
+ "gitHead": "fa2ab3ae9efa15367264151398635a915c7b411d",
+ "license": "BSD-3-Clause",
"main": "index.js",
"maintainers": [
{
"name": "arekinath",
"email": "a...@cooperi.net"
+ },
+ {
+ "name": "dap",
+ "email": "d...@cs.brown.edu"
+ },
+ {
+ "name": "jclulow",
+ "email": "j...@sysmgr.org"
+ },
+ {
+ "name": "trentm",
+ "email": "tre...@gmail.com"
}
],
"name": "bcrypt-pbkdf",
"optionalDependencies": {},
"readme": "ERROR: No README data found!",
"scripts": {},
- "version": "1.0.0"
+ "version": "1.0.1"
}
diff --git a/node_modules/content-type/package.json
b/node_modules/content-type/package.json
index 8537df4..036da47 100644
--- a/node_modules/content-type/package.json
+++ b/node_modules/content-type/package.json
@@ -49,7 +49,7 @@
"/"
],
"_resolved":
"git+https://github.com/wikimedia/content-type.git#47b2632d0a2ee79a7d67268e2f6621becd95d05b";,
- "_shasum": "158a6d94c2759089ece19408761522c04680c000",
+ "_shasum": "80d0649ab23cf810edc0d08f625b9270675e1c9f",
"_shrinkwrap": null,
"_spec":
"content-type@git+https://github.com/wikimedia/content-type.git#master";,
"_where": "/opt/service",
diff --git a/node_modules/json-stable-stringify/package.json
b/node_modules/json-stable-stringify/package.json
index 877e51d..05f3c5d 100644
--- a/node_modules/json-stable-stringify/package.json
+++ b/node_modules/json-stable-stringify/package.json
@@ -51,7 +51,7 @@
"/restbase-mod-table-cassandra"
],
"_resolved":
"git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f";,
- "_shasum": "d19eb5f7427e23004920405640699502969a1f03",
+ "_shasum": "ba88ede951dda64ec219e3ff5fff015f65d80491",
"_shrinkwrap": null,
"_spec":
"json-stable-stringify@git+https://github.com/wikimedia/json-stable-stringify.git#master";,
"_where": "/opt/service",
diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index 257da4a..83f65f2 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
"/limitation"
],
"_resolved":
"git+https://github.com/gwicke/kad.git#f35971036f43814043245da82b12d035b7bbfd16";,
- "_shasum": "2cbc963b8d394a2704c0a7e96c129046a62d695d",
+ "_shasum": "ab949140c8127290437a436a22a5a5fbd50809ce",
"_shrinkwrap": null,
"_spec": "kad@git+https://github.com/gwicke/kad.git#master";,
"_where": "/opt/service/node_modules/limitation",
diff --git a/node_modules/swagger-ui/package.json
b/node_modules/swagger-ui/package.json
index 375c739..c121757 100644
--- a/node_modules/swagger-ui/package.json
+++ b/node_modules/swagger-ui/package.json
@@ -49,7 +49,7 @@
"/hyperswitch"
],
"_resolved":
"git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541";,
- "_shasum": "b034ec77783cb631898c268c6d6b1039e914e30f",
+ "_shasum": "3009ef75f0abe7bdffbb5e7af65f827d2c428783",
"_shrinkwrap": null,
"_spec": "swagger-ui@git+https://github.com/wikimedia/swagger-ui.git#master";,
"_where": "/opt/service/node_modules/hyperswitch",
diff --git a/restbase b/restbase
index cdd2c25..e628423 160000
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit cdd2c25aa150d31a95b6820e34e5853251e23186
+Subproject commit e628423b47745f8c5c4a5d2d2f6665731b1f616b
--
To view, visit https://gerrit.wikimedia.org/r/335673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1eb8cc3c75965b86921f1470efde1f842df89467
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
