GWicke has submitted this change and it was merged.
Change subject: Update to master
......................................................................
Update to master
Change-Id: I5173086599c59b30d9fc9e0c6c8fddac27a7b57e
---
M
node_modules/bunyan/node_modules/mv/node_modules/mkdirp/node_modules/minimist/package.json
M node_modules/coveralls/node_modules/log-driver/package.json
M
node_modules/coveralls/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
M node_modules/istanbul/node_modules/async/package.json
M node_modules/istanbul/node_modules/fileset/node_modules/glob/package.json
M node_modules/istanbul/node_modules/mkdirp/node_modules/minimist/package.json
M node_modules/istanbul/node_modules/mkdirp/package.json
M node_modules/istanbul/package.json
M node_modules/mocha/node_modules/diff/package.json
M node_modules/mocha/node_modules/escape-string-regexp/package.json
M node_modules/mocha/node_modules/glob/package.json
M node_modules/mocha/node_modules/jade/package.json
M node_modules/mocha/node_modules/mkdirp/node_modules/minimist/package.json
M node_modules/mocha/node_modules/mkdirp/package.json
M
node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
A node_modules/restbase-mod-table-cassandra/.npmignore
M node_modules/restbase-mod-table-cassandra/package.json
M
node_modules/service-runner/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/node_modules/minimist/package.json
M node_modules/swagger-test/package.json
M node_modules/swagger-ui/node_modules/shred/node_modules/cookiejar/package.json
M node_modules/swagger-ui/node_modules/shred/node_modules/sprintf/package.json
M node_modules/swagger-ui/node_modules/shred/package.json
M node_modules/url-template/package.json
M restbase
24 files changed, 56 insertions(+), 26 deletions(-)
Approvals:
GWicke: Verified; Looks good to me, approved
diff --git
a/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/node_modules/minimist/package.json
b/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/node_modules/minimist/package.json
index 77758a3..09e9ec4 100644
---
a/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/node_modules/minimist/package.json
+++
b/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/node_modules/minimist/package.json
@@ -60,6 +60,8 @@
"email": "[email protected]"
}
],
+ "directories": {},
"_shasum": "857fcabfc3397d2625b8228262e86aa7a011b05d",
- "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+ "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/coveralls/node_modules/log-driver/package.json
b/node_modules/coveralls/node_modules/log-driver/package.json
index 2fdb275..80699b6 100644
--- a/node_modules/coveralls/node_modules/log-driver/package.json
+++ b/node_modules/coveralls/node_modules/log-driver/package.json
@@ -47,6 +47,8 @@
"name": "cainus",
"email": "[email protected]"
},
+ "directories": {},
"_shasum": "2d62d7faef45d8a71341961a04b0761eca99cfa3",
- "_resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz";
+ "_resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git
a/node_modules/coveralls/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
b/node_modules/coveralls/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
index 2d6990c..45efd3f 100644
---
a/node_modules/coveralls/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
+++
b/node_modules/coveralls/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
@@ -38,5 +38,6 @@
"bugs": {
"url": "https://github.com/rmustacc/node-ctype/issues";
},
- "readme": "ERROR: No README data found!"
+ "readme": "ERROR: No README data found!",
+ "scripts": {}
}
diff --git a/node_modules/istanbul/node_modules/async/package.json
b/node_modules/istanbul/node_modules/async/package.json
index bdbe740..9d15cd7 100644
--- a/node_modules/istanbul/node_modules/async/package.json
+++ b/node_modules/istanbul/node_modules/async/package.json
@@ -41,7 +41,7 @@
"shasum": "ac3613b1da9bed1b47510bb4651b8931e47146c7",
"tarball": "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
},
- "_from": "async@~0.9.0",
+ "_from": "[email protected]",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "caolan",
diff --git
a/node_modules/istanbul/node_modules/fileset/node_modules/glob/package.json
b/node_modules/istanbul/node_modules/fileset/node_modules/glob/package.json
index 46a04b1..915a365 100644
--- a/node_modules/istanbul/node_modules/fileset/node_modules/glob/package.json
+++ b/node_modules/istanbul/node_modules/fileset/node_modules/glob/package.json
@@ -36,7 +36,7 @@
"homepage": "https://github.com/isaacs/node-glob";,
"_id": "[email protected]",
"_shasum": "4a973f635b9190f715d10987d5c00fd2815ebe3d",
- "_from": "glob@~ 3.2.1",
+ "_from": "[email protected]",
"_npmVersion": "1.4.10",
"_npmUser": {
"name": "isaacs",
diff --git
a/node_modules/istanbul/node_modules/mkdirp/node_modules/minimist/package.json
b/node_modules/istanbul/node_modules/mkdirp/node_modules/minimist/package.json
index 77758a3..09e9ec4 100644
---
a/node_modules/istanbul/node_modules/mkdirp/node_modules/minimist/package.json
+++
b/node_modules/istanbul/node_modules/mkdirp/node_modules/minimist/package.json
@@ -60,6 +60,8 @@
"email": "[email protected]"
}
],
+ "directories": {},
"_shasum": "857fcabfc3397d2625b8228262e86aa7a011b05d",
- "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+ "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/istanbul/node_modules/mkdirp/package.json
b/node_modules/istanbul/node_modules/mkdirp/package.json
index a6de8f3..b7fe466 100644
--- a/node_modules/istanbul/node_modules/mkdirp/package.json
+++ b/node_modules/istanbul/node_modules/mkdirp/package.json
@@ -39,7 +39,7 @@
"shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
"tarball": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
},
- "_from": "mkdirp@~0.5.0",
+ "_from": "[email protected]",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "substack",
diff --git a/node_modules/istanbul/package.json
b/node_modules/istanbul/package.json
index 24e9260..36c6115 100644
--- a/node_modules/istanbul/package.json
+++ b/node_modules/istanbul/package.json
@@ -220,6 +220,5 @@
"tarball": "http://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz";,
- "readme": "ERROR: No README data found!"
+ "_resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz";
}
diff --git a/node_modules/mocha/node_modules/diff/package.json
b/node_modules/mocha/node_modules/diff/package.json
index ff552c5..5a6926d 100644
--- a/node_modules/mocha/node_modules/diff/package.json
+++ b/node_modules/mocha/node_modules/diff/package.json
@@ -31,7 +31,7 @@
},
"main": "./diff",
"scripts": {
- "test": "node_modules/.bin/mocha test/*.js"
+ "test": "mocha test/*.js"
},
"dependencies": {},
"devDependencies": {
@@ -54,6 +54,8 @@
"name": "kpdecker",
"email": "[email protected]"
},
+ "directories": {},
"_shasum": "343276308ec991b7bc82267ed55bc1411f971666",
- "_resolved": "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz";
+ "_resolved": "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/mocha/node_modules/escape-string-regexp/package.json
b/node_modules/mocha/node_modules/escape-string-regexp/package.json
index b47d665..5da6f01 100644
--- a/node_modules/mocha/node_modules/escape-string-regexp/package.json
+++ b/node_modules/mocha/node_modules/escape-string-regexp/package.json
@@ -64,5 +64,6 @@
"tarball":
"http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz";
},
"directories": {},
- "_resolved":
"https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz";
+ "_resolved":
"https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/mocha/node_modules/glob/package.json
b/node_modules/mocha/node_modules/glob/package.json
index b00d5b9..aa7a4e2 100644
--- a/node_modules/mocha/node_modules/glob/package.json
+++ b/node_modules/mocha/node_modules/glob/package.json
@@ -51,5 +51,6 @@
],
"directories": {},
"_shasum": "e313eeb249c7affaa5c475286b0e115b59839467",
- "_resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
+ "_resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/mocha/node_modules/jade/package.json
b/node_modules/mocha/node_modules/jade/package.json
index 1c79f30..191cb4d 100644
--- a/node_modules/mocha/node_modules/jade/package.json
+++ b/node_modules/mocha/node_modules/jade/package.json
@@ -56,6 +56,5 @@
"bugs": {
"url": "https://github.com/visionmedia/jade/issues";
},
- "readme": "ERROR: No README data found!",
- "homepage": "https://github.com/visionmedia/jade";
+ "readme": "ERROR: No README data found!"
}
diff --git
a/node_modules/mocha/node_modules/mkdirp/node_modules/minimist/package.json
b/node_modules/mocha/node_modules/mkdirp/node_modules/minimist/package.json
index 77758a3..09e9ec4 100644
--- a/node_modules/mocha/node_modules/mkdirp/node_modules/minimist/package.json
+++ b/node_modules/mocha/node_modules/mkdirp/node_modules/minimist/package.json
@@ -60,6 +60,8 @@
"email": "[email protected]"
}
],
+ "directories": {},
"_shasum": "857fcabfc3397d2625b8228262e86aa7a011b05d",
- "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+ "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/mocha/node_modules/mkdirp/package.json
b/node_modules/mocha/node_modules/mkdirp/package.json
index a6de8f3..b7fe466 100644
--- a/node_modules/mocha/node_modules/mkdirp/package.json
+++ b/node_modules/mocha/node_modules/mkdirp/package.json
@@ -39,7 +39,7 @@
"shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
"tarball": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
},
- "_from": "mkdirp@~0.5.0",
+ "_from": "[email protected]",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "substack",
diff --git
a/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
b/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
index 2d6990c..45efd3f 100644
---
a/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
+++
b/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
@@ -38,5 +38,6 @@
"bugs": {
"url": "https://github.com/rmustacc/node-ctype/issues";
},
- "readme": "ERROR: No README data found!"
+ "readme": "ERROR: No README data found!",
+ "scripts": {}
}
diff --git a/node_modules/restbase-mod-table-cassandra/.npmignore
b/node_modules/restbase-mod-table-cassandra/.npmignore
new file mode 100644
index 0000000..c4ffe1d
--- /dev/null
+++ b/node_modules/restbase-mod-table-cassandra/.npmignore
@@ -0,0 +1,4 @@
+coverage/
+.coveralls.yml
+node_modules
+npm-debug.log
\ No newline at end of file
diff --git a/node_modules/restbase-mod-table-cassandra/package.json
b/node_modules/restbase-mod-table-cassandra/package.json
index b421db0..abdd806 100644
--- a/node_modules/restbase-mod-table-cassandra/package.json
+++ b/node_modules/restbase-mod-table-cassandra/package.json
@@ -28,11 +28,11 @@
},
"readme": "# [RESTBase](https://github.com/gwicke/restbase) table storage on
Cassandra\n\nProvides a high-level table storage service abstraction similar to
Amazon\nDynamoDB or Google DataStore, with a Cassandra backend. See [the
design\ndocs](https://github.com/gwicke/restbase-cassandra/tree/master/doc)
for\ndetails and background.\n\nThis is the default table storage backend
for\n[RESTBase](https://github.com/gwicke/restbase), and automatically
installed as\nan npm module dependency (`restbase-mod-table-cassandra`). See
the install instructions\nthere.\n \n## Issue tracking\n\nWe use [Phabricator
to
track\nissues](https://phabricator.wikimedia.org/maniphest/task/create/?projects=PHID-PROJ-xdgck5inpvozg2uwmj3f).
See the [list of current issues in
RESTBase-cassandra](https://phabricator.wikimedia.org/tag/restbase-cassandra/).\n\n##
Status\n\nPreparing for production.\n\n[](https://travis-ci.org/wikimedia/restbase-mod-table-cassandra)\n[](https://coveralls.io/r/wikimedia/restbase-mod-table-cassandra)\n\nFeatures:\n-
basic table storage service with REST interface, backed by Cassandra\n-
multi-tenant design: domain creation, prepared for per-domain ACLs\n- table
creation with declarative JSON schemas\n- secondary index creation and basic
maintenance\n- data insertion and retrieval by primary key, including range
queries\n\n### Next steps\n- More refined [secondary\n
index](https://github.com/gwicke/restbase-cassandra/blob/master/doc/SecondaryIndexes.md)\n
implementation\n - range queries on secondary indexes\n- Refine HTTP
interface & response formats, especially paging\n- Authentication (OAuth2 / JWT
/ JWS / auth service callbacks) and ACLs\n-
[Transactions](https://github.com/gwicke/restbase-cassandra/blob/master/doc/Transactions.md):\n
light-weight CAS and 2PC\n- Get ready for production: robustness,
performance, logging\n- Basic schema evolution support\n\n## Contributors\n*
Gabriel Wicke <[email protected]>\n* Hardik Juneja
<[email protected]>\n",
"readmeFilename": "Readme.md",
+ "gitHead": "e542fc18ab046d41c7967f8292fe57680eb9c42c",
"bugs": {
"url": "https://github.com/wikimedia/restbase-mod-table-cassandra/issues";
},
"_id": "[email protected]",
- "_shasum": "12462ce0a633dec0476ca159ba5d45f440757481",
- "_resolved":
"git+https://github.com/wikimedia/restbase-mod-table-cassandra#e64300827a8aa7029c1c3583f9fbc30efa3bb039";,
- "_from":
"restbase-mod-table-cassandra@git+https://github.com/wikimedia/restbase-mod-table-cassandra#cassandra_driver_v2";
+ "_shasum": "a7c5a7408515acd0e3f54e3055b3532e175ede8a",
+ "_from": "restbase-mod-table-cassandra@^0.5.0"
}
diff --git
a/node_modules/service-runner/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/node_modules/minimist/package.json
b/node_modules/service-runner/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/node_modules/minimist/package.json
index 78fa8a3..09e9ec4 100644
---
a/node_modules/service-runner/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/node_modules/minimist/package.json
+++
b/node_modules/service-runner/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/node_modules/minimist/package.json
@@ -60,6 +60,7 @@
"email": "[email protected]"
}
],
+ "directories": {},
"_shasum": "857fcabfc3397d2625b8228262e86aa7a011b05d",
"_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";,
"readme": "ERROR: No README data found!"
diff --git a/node_modules/swagger-test/package.json
b/node_modules/swagger-test/package.json
index 2947620..115a147 100644
--- a/node_modules/swagger-test/package.json
+++ b/node_modules/swagger-test/package.json
@@ -56,5 +56,7 @@
"shasum": "aea999142508ece639d16359cd9be606f1430bed",
"tarball":
"http://registry.npmjs.org/swagger-test/-/swagger-test-0.2.0.tgz";
},
- "_resolved":
"https://registry.npmjs.org/swagger-test/-/swagger-test-0.2.0.tgz";
+ "directories": {},
+ "_resolved":
"https://registry.npmjs.org/swagger-test/-/swagger-test-0.2.0.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git
a/node_modules/swagger-ui/node_modules/shred/node_modules/cookiejar/package.json
b/node_modules/swagger-ui/node_modules/shred/node_modules/cookiejar/package.json
index 08e3dc1..9894bab 100644
---
a/node_modules/swagger-ui/node_modules/shred/node_modules/cookiejar/package.json
+++
b/node_modules/swagger-ui/node_modules/shred/node_modules/cookiejar/package.json
@@ -28,6 +28,11 @@
"email": "[email protected]"
}
],
+ "directories": {},
"_shasum": "c04b048f688f801623acd90cd5848c2bf8891a17",
- "_resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-1.3.1.tgz";
+ "_resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-1.3.1.tgz";,
+ "bugs": {
+ "url": "https://github.com/bmeck/node-cookiejar/issues";
+ },
+ "readme": "ERROR: No README data found!"
}
diff --git
a/node_modules/swagger-ui/node_modules/shred/node_modules/sprintf/package.json
b/node_modules/swagger-ui/node_modules/shred/node_modules/sprintf/package.json
index b80ff85..3599360 100644
---
a/node_modules/swagger-ui/node_modules/shred/node_modules/sprintf/package.json
+++
b/node_modules/swagger-ui/node_modules/shred/node_modules/sprintf/package.json
@@ -32,5 +32,6 @@
},
"_shasum": "e8925fc9894e1aa6899e9091c7f2a12130b70de5",
"_from": "[email protected]",
- "_resolved": "https://registry.npmjs.org/sprintf/-/sprintf-0.1.1.tgz";
+ "_resolved": "https://registry.npmjs.org/sprintf/-/sprintf-0.1.1.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/swagger-ui/node_modules/shred/package.json
b/node_modules/swagger-ui/node_modules/shred/package.json
index e0e12aa..b59a624 100644
--- a/node_modules/swagger-ui/node_modules/shred/package.json
+++ b/node_modules/swagger-ui/node_modules/shred/package.json
@@ -88,6 +88,8 @@
"name": "automatthew",
"email": "[email protected]"
},
+ "directories": {},
"_shasum": "cf1cfe80f79bf5313d2edc3b912278fd107a8717",
- "_resolved": "https://registry.npmjs.org/shred/-/shred-0.8.10.tgz";
+ "_resolved": "https://registry.npmjs.org/shred/-/shred-0.8.10.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/url-template/package.json
b/node_modules/url-template/package.json
index 933e82c..15d8ed5 100644
--- a/node_modules/url-template/package.json
+++ b/node_modules/url-template/package.json
@@ -52,5 +52,8 @@
}
],
"_shasum": "16853da41f63bf95543a70f7c300b8a642816533",
- "_resolved":
"https://registry.npmjs.org/url-template/-/url-template-2.0.4.tgz";
+ "_resolved":
"https://registry.npmjs.org/url-template/-/url-template-2.0.4.tgz";,
+ "bugs": {
+ "url": "https://github.com/bramstein/url-template/issues";
+ }
}
diff --git a/restbase b/restbase
index 03d851a..522e014 160000
--- a/restbase
+++ b/restbase
-Subproject commit 03d851a5f9c3dbd773f66faf58f3c5ace232bfbf
+Subproject commit 522e01491a42bb822b20f26e518557cd17ea91ab
--
To view, visit https://gerrit.wikimedia.org/r/194406
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5173086599c59b30d9fc9e0c6c8fddac27a7b57e
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
