Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10028. Merge change r1530100 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530101 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jing Zhao 2013-10-07 22:42:01 +00:00
parent 6c2d04b409
commit 2aee8b321b
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -138,6 +138,8 @@ Release 2.2.0 - 2013-10-13
HADOOP-10017. Fix NPE in DFSClient#getDelegationToken when doing Distcp HADOOP-10017. Fix NPE in DFSClient#getDelegationToken when doing Distcp
from a secured cluster to an insecured cluster. (Haohui Mai via jing9) from a secured cluster to an insecured cluster. (Haohui Mai via jing9)
HADOOP-10028. Malformed ssl-server.xml.example. (Haohui Mai via jing9)
Release 2.1.1-beta - 2013-09-23 Release 2.1.1-beta - 2013-09-23
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

1
hadoop-common-project/hadoop-common/src/main/conf/ssl-server.xml.example
View File

@ -44,6 +44,7 @@
<value>10000</value> <value>10000</value>
<description>Truststore reload check interval, in milliseconds. <description>Truststore reload check interval, in milliseconds.
Default value is 10000 (10 seconds). Default value is 10000 (10 seconds).
</description>
</property> </property>
<property> <property>