hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject hadoop git commit: HADOOP-11488. Difference in default connection timeout for S3A FS. Contributed by Daisuke Kobayashi.
Date Sat, 31 Jan 2015 18:49:14 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 26c2de36e -> ffc75d6eb


HADOOP-11488. Difference in default connection timeout for S3A FS. Contributed by Daisuke
Kobayashi.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ffc75d6e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ffc75d6e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ffc75d6e

Branch: refs/heads/trunk
Commit: ffc75d6ebe4912f20f4f4870d2a50abbe4557bfa
Parents: 26c2de3
Author: Harsh J <harsh@cloudera.com>
Authored: Sun Feb 1 00:16:52 2015 +0530
Committer: Harsh J <harsh@cloudera.com>
Committed: Sun Feb 1 00:17:04 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/ffc75d6e/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 37fcee7..f3647fb 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -540,6 +540,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/ffc75d6e/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 c11669d..598ce6f 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
@@ -719,7 +719,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/ffc75d6e/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>
 


Mime
View raw message