Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into task/add-storage-co…
Browse files Browse the repository at this point in the history
…nfig-list-8498

# Conflicts:
#	pkg/api/controller.go
  • Loading branch information
N-o-Z committed Jan 22, 2025
2 parents 7674e0e + 6fd5061 commit 4ad7f61
Show file tree
Hide file tree
Showing 30 changed files with 203 additions and 165 deletions.
4 changes: 2 additions & 2 deletions api/swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ components:
type: string
storage_id:
type: string
description: Unique identifier of the underlying data store
description: Unique identifier of the underlying data store. *EXPERIMENTAL*
storage_namespace:
type: string
description: Filesystem URI to store the underlying data in (e.g. "s3://my-bucket/some/path/")
Expand Down Expand Up @@ -269,7 +269,7 @@ components:
pattern: "^[a-z0-9][a-z0-9-]{2,62}$"
storage_id:
type: string
description: Unique identifier of the underlying data store
description: Unique identifier of the underlying data store. *EXPERIMENTAL*
storage_namespace:
type: string
description: 'Filesystem URI to store the underlying data in (e.g. "s3://my-bucket/some/path/")'
Expand Down
4 changes: 2 additions & 2 deletions clients/java/api/openapi.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clients/java/docs/Repository.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clients/java/docs/RepositoryCreation.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clients/python/docs/Repository.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clients/python/docs/RepositoryCreation.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clients/python/lakefs_sdk/models/repository.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clients/python/lakefs_sdk/models/repository_creation.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clients/rust/docs/Repository.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clients/rust/docs/RepositoryCreation.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clients/rust/src/models/repository.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clients/rust/src/models/repository_creation.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/assets/js/swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ components:
type: string
storage_id:
type: string
description: Unique identifier of the underlying data store
description: Unique identifier of the underlying data store. *EXPERIMENTAL*
storage_namespace:
type: string
description: Filesystem URI to store the underlying data in (e.g. "s3://my-bucket/some/path/")
Expand Down Expand Up @@ -269,7 +269,7 @@ components:
pattern: "^[a-z0-9][a-z0-9-]{2,62}$"
storage_id:
type: string
description: Unique identifier of the underlying data store
description: Unique identifier of the underlying data store. *EXPERIMENTAL*
storage_namespace:
type: string
description: 'Filesystem URI to store the underlying data in (e.g. "s3://my-bucket/some/path/")'
Expand Down
Loading

0 comments on commit 4ad7f61

Please sign in to comment.