You are viewing a plain text version of this content. The canonical link for it is here.

Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2013/10/08 00:46:10 UTC

svn commit: r1530102 - in /hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/conf/ssl-server.xml.example

Author: jing9
Date: Mon Oct  7 22:46:10 2013
New Revision: 1530102

URL: http://svn.apache.org/r1530102
Log:
HADOOP-10028. Merge change r1530101 from branch-2.

Modified:
    hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt
    hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/src/main/conf/ssl-server.xml.example

Modified: hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1530102&r1=1530101&r2=1530102&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt Mon Oct  7 22:46:10 2013
@@ -42,6 +42,8 @@ Release 2.2.0 - 2013-10-13
     HADOOP-10017. Fix NPE in DFSClient#getDelegationToken when doing Distcp 
     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
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/src/main/conf/ssl-server.xml.example
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/src/main/conf/ssl-server.xml.example?rev=1530102&r1=1530101&r2=1530102&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/src/main/conf/ssl-server.xml.example (original)
+++ hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/src/main/conf/ssl-server.xml.example Mon Oct  7 22:46:10 2013
@@ -44,6 +44,7 @@
   <value>10000</value>
   <description>Truststore reload check interval, in milliseconds.
   Default value is 10000 (10 seconds).
+  </description>
 </property>
 
 <property>