From ac806eecf759bc40fb8c92ae112c9f2220128caf Mon Sep 17 00:00:00 2001 From: Shubanker Chourasia Date: Mon, 5 Feb 2024 07:10:57 +0530 Subject: [PATCH] removed merge conflict in CONFIGURATION.md (#859) --- CONFIGURATION.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CONFIGURATION.md b/CONFIGURATION.md index bbd71db8c3..db852b7419 100644 --- a/CONFIGURATION.md +++ b/CONFIGURATION.md @@ -23,7 +23,6 @@ Here are some Stargate-relevant property groups that are necessary for correct s ## Document limits configuration *Configuration for document limits, defined by [DocumentLimitsConfig.java](src/main/java/io/stargate/sgv2/jsonapi/config/DocumentLimitsConfig.java).* -<<<<<<< HEAD | Property | Type | Default | Description | |-----------------------------------------------------------------|-------|-------------|-----------------------------------------------------------------------------------------| | `stargate.jsonapi.document.limits.max-size` | `int` | `4_000_000` | The maximum size of (in characters) a single document. | @@ -76,4 +75,4 @@ Here are some Stargate-relevant property groups that are necessary for correct s |-----------------------------------------------------|-----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------| | `stargate.jsonapi.logging.enabled` | `boolean` | `false` | Setting it to `true` enables command level logging. | | `stargate.jsonapi.logging.only-results-with-errors` | `boolean` | `true` | Setting it to `true` prints the command level info only for the commands where the command result has errors. | -| `stargate.jsonapi.logging.enabled-tenants` | `string` | `ALL` | Comma separated list of tenants for which command level logging should be enabled. Default is a special keyword called `ALL` which prints this log for all tenants | \ No newline at end of file +| `stargate.jsonapi.logging.enabled-tenants` | `string` | `ALL` | Comma separated list of tenants for which command level logging should be enabled. Default is a special keyword called `ALL` which prints this log for all tenants |