Skip to content

Commit

Permalink
Merge branch 'JIRA-16521' of https://github.com/marsupialtail/arrow i…
Browse files Browse the repository at this point in the history
…nto JIRA-16521
  • Loading branch information
marsupialtail committed Jul 26, 2022
2 parents f932c86 + 925ad52 commit ad4b161
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion cpp/src/arrow/filesystem/s3fs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,6 @@ class ClientBuilder {
client_config_.connectTimeoutMs = std::lround(options_.connect_timeout * 1000);
}


client_config_.endpointOverride = ToAwsString(options_.endpoint_override);
if (options_.scheme == "http") {
client_config_.scheme = Aws::Http::Scheme::HTTP;
Expand Down
1 change: 0 additions & 1 deletion cpp/src/arrow/filesystem/s3fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ struct ARROW_EXPORT S3Options {
/// server).
std::string region;


/// if unset (or any value less than 0), the AWS SDK default values will be used.
/// request_timeout default 3 seconds
/// If less/equal zero then this property is ignored and the default is used
Expand Down

0 comments on commit ad4b161

Please sign in to comment.