Merge branch 'master' into bg-add-queue-metrics

This commit is contained in:
Brian Gough 2020-04-06 12:12:12 +01:00 committed by GitHub
commit 55cbfd9962
2 changed files with 11 additions and 11 deletions

View file

@ -1876,9 +1876,9 @@
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
}, },
"ioredis": { "ioredis": {
"version": "4.14.1", "version": "4.16.1",
"resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.14.1.tgz", "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.16.1.tgz",
"integrity": "sha512-94W+X//GHM+1GJvDk6JPc+8qlM7Dul+9K+lg3/aHixPN7ZGkW6qlvX0DG6At9hWtH2v3B32myfZqWoANUJYGJA==", "integrity": "sha512-g76Mm9dE7BLuewncu1MimGZw5gDDjDwjoRony/VoSxSJEKAhuYncDEwYKYjtHi2NWsTNIB6XXRjE64uVa/wpKQ==",
"requires": { "requires": {
"cluster-key-slot": "^1.1.0", "cluster-key-slot": "^1.1.0",
"debug": "^4.1.1", "debug": "^4.1.1",
@ -2055,9 +2055,9 @@
"integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==" "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg=="
}, },
"logger-sharelatex": { "logger-sharelatex": {
"version": "1.9.0", "version": "1.9.1",
"resolved": "https://registry.npmjs.org/logger-sharelatex/-/logger-sharelatex-1.9.0.tgz", "resolved": "https://registry.npmjs.org/logger-sharelatex/-/logger-sharelatex-1.9.1.tgz",
"integrity": "sha512-yVTuha82047IiMOQLgQHCZGKkJo6I2+2KtiFKpgkIooR2yZaoTEvAeoMwBesSDSpGUpvUJ/+9UI+PmRyc+PQKQ==", "integrity": "sha512-9s6JQnH/PN+Js2CmI8+J3MQCTNlRzP2Dh4pcekXrV6Jm5J4HzyPi+6d3zfBskZ4NBmaUVw9hC4p5dmdaRmh4mQ==",
"requires": { "requires": {
"@google-cloud/logging-bunyan": "^2.0.0", "@google-cloud/logging-bunyan": "^2.0.0",
"@overleaf/o-error": "^2.0.0", "@overleaf/o-error": "^2.0.0",
@ -2792,13 +2792,13 @@
} }
}, },
"redis-sharelatex": { "redis-sharelatex": {
"version": "1.0.11", "version": "1.0.12",
"resolved": "https://registry.npmjs.org/redis-sharelatex/-/redis-sharelatex-1.0.11.tgz", "resolved": "https://registry.npmjs.org/redis-sharelatex/-/redis-sharelatex-1.0.12.tgz",
"integrity": "sha512-rKXPVLmFC9ycpRc5e4rULOwi9DB0LqRcWEiUxQuJNSVgcqCxpGqVw+zwivo+grk3G2tGpduh3/8y+4KVHWOntw==", "integrity": "sha512-Z+LDGaRNgZ+NiDaCC/R0N3Uy6SCtbKXqiXlvCwAbIQRSZUc69OVx/cQ3i5qDF7zeERhh+pnTd+zGs8nVfa5p+Q==",
"requires": { "requires": {
"async": "^2.5.0", "async": "^2.5.0",
"coffee-script": "1.8.0", "coffee-script": "1.8.0",
"ioredis": "~4.14.1", "ioredis": "~4.16.1",
"redis-sentinel": "0.1.1", "redis-sentinel": "0.1.1",
"underscore": "1.7.0" "underscore": "1.7.0"
}, },

View file

@ -28,7 +28,7 @@
"logger-sharelatex": "^1.9.1", "logger-sharelatex": "^1.9.1",
"metrics-sharelatex": "^2.6.2", "metrics-sharelatex": "^2.6.2",
"mongojs": "^2.6.0", "mongojs": "^2.6.0",
"redis-sharelatex": "^1.0.11", "redis-sharelatex": "^1.0.12",
"request": "^2.47.0", "request": "^2.47.0",
"requestretry": "^4.1.0", "requestretry": "^4.1.0",
"settings-sharelatex": "^1.1.0" "settings-sharelatex": "^1.1.0"