mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-26 17:41:59 +00:00
deal with conflict
This commit is contained in:
parent
7b4902133d
commit
636e7ddae7
@ -45,7 +45,6 @@ std::unique_ptr<S3::Client> getClient(
|
||||
{
|
||||
String endpoint = context->getMacros()->expand(config.getString(config_prefix + ".endpoint"));
|
||||
S3::URI uri(endpoint);
|
||||
|
||||
if(!uri.key.ends_with('/'))
|
||||
uri.key.push_back('/');
|
||||
|
||||
|
@ -104,7 +104,6 @@ void registerDiskS3(DiskFactory & factory, bool global_skip_access_check)
|
||||
{
|
||||
String endpoint = context->getMacros()->expand(config.getString(config_prefix + ".endpoint"));
|
||||
S3::URI uri(endpoint);
|
||||
|
||||
if(!uri.key.ends_with('/'))
|
||||
uri.key.push_back('/');
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user