Commit a4fa1054 authored by Evan Read's avatar Evan Read

Merge branch 'sh-direct-upload-with-consolidated-objs' into 'master'

Clarify that direct upload is used for consolidated object store

See merge request gitlab-org/gitlab!51443
parents da3ab886 907681a5
......@@ -61,10 +61,10 @@ must be enabled, only the following providers can be used:
- [Google Cloud Storage](#google-cloud-storage-gcs)
- [Azure Blob storage](#azure-blob-storage)
Background upload isn't supported with the consolidated object storage
configuration. We recommend enabling direct upload mode because it doesn't
require a shared folder, and [this setting may become the
default](https://gitlab.com/gitlab-org/gitlab/-/issues/27331).
When consolidated object storage is used, direct upload is enabled
automatically. Background upload is not supported. For storage-specific
configuration, [direct upload may become the default](https://gitlab.com/gitlab-org/gitlab/-/issues/27331)
because it does not require a shared folder.
Consolidated object storage configuration can't be used for backups or
Mattermost. See the [full table for a complete list](#storage-specific-configuration).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment