Skip to content

Commit 873168f

Browse files
committed
Resolve Conflicts
1 parent 5239d96 commit 873168f

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

src/Options/Definitions.js

-7
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,6 @@ module.exports.ParseServerOptions = {
142142
action: parsers.booleanParser,
143143
default: false,
144144
},
145-
enableSingleSchemaCache: {
146-
env: 'PARSE_SERVER_ENABLE_SINGLE_SCHEMA_CACHE',
147-
help:
148-
'Use a single schema cache shared across requests. Reduces number of queries made to _SCHEMA, defaults to false, i.e. unique schema cache per request.',
149-
action: parsers.booleanParser,
150-
default: false,
151-
},
152145
encryptionKey: {
153146
env: 'PARSE_SERVER_ENCRYPTION_KEY',
154147
help: 'Key for encrypting your files',

src/Options/docs.js

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
* @property {Number} emailVerifyTokenValidityDuration Email verification token validity duration, in seconds
2727
* @property {Boolean} enableAnonymousUsers Enable (or disable) anonymous users, defaults to true
2828
* @property {Boolean} enableExpressErrorHandler Enables the default express error handler for all errors
29-
* @property {Boolean} enableSingleSchemaCache Use a single schema cache shared across requests. Reduces number of queries made to _SCHEMA, defaults to false, i.e. unique schema cache per request.
3029
* @property {String} encryptionKey Key for encrypting your files
3130
* @property {Boolean} expireInactiveSessions Sets wether we should expire the inactive sessions, defaults to true
3231
* @property {String} fileKey Key for your files

0 commit comments

Comments
 (0)