Repository: hadoop Updated Branches: refs/heads/branch-2 151e147e6 -> 648510e03
HADOOP-11488. Difference in default connection timeout for S3A FS. Contributed by Daisuke Kobayashi. (cherry picked from commit ffc75d6ebe4912f20f4f4870d2a50abbe4557bfa) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/648510e0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/648510e0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/648510e0 Branch: refs/heads/branch-2 Commit: 648510e031a1fd5f8ebe9b2f62549642ed029db0 Parents: 151e147 Author: Harsh J <[email protected]> Authored: Sun Feb 1 00:16:52 2015 +0530 Committer: Harsh J <[email protected]> Committed: Sun Feb 1 00:17:24 2015 +0530 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/main/resources/core-default.xml | 2 +- .../hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/648510e0/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 32d42b3..7e74069 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -179,6 +179,9 @@ Release 2.7.0 - UNRELEASED BUG FIXES + HADOOP-11488. Difference in default connection timeout for S3A FS + (Daisuke Kobayashi via harsh) + HADOOP-11256. Some site docs have inconsistent appearance (Masatake Iwasaki via aw) http://git-wip-us.apache.org/repos/asf/hadoop/blob/648510e0/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml index 0a0bdfe..4070619 100644 --- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml +++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml @@ -711,7 +711,7 @@ for ldap providers in the same way as above does. <property> <name>fs.s3a.connection.timeout</name> - <value>5000</value> + <value>50000</value> <description>Socket connection timeout in seconds.</description> </property> http://git-wip-us.apache.org/repos/asf/hadoop/blob/648510e0/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md b/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md index d443389..375f82c 100644 --- a/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md +++ b/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md @@ -172,7 +172,7 @@ If you do any of these: change your credentials immediately! <property> <name>fs.s3a.connection.timeout</name> - <value>5000</value> + <value>50000</value> <description>Socket connection timeout in seconds.</description> </property>
