From 78552d8857e218ca1973d6644236842a7e16aef0 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Thu, 3 Dec 2015 11:45:45 +0800
Subject: [PATCH] HADOOP-12565. Replace DSA with RSA for SSH key type in
 SingleCluster.md. Contributed by Mingliang Liu.

(cherry picked from commit 3857fed2c8fc601b46e8331f73a3104f4f33e498)
(cherry picked from commit 15c2f709c685986518feba60fc35222574ce3f0f)
---
 hadoop-common-project/hadoop-common/CHANGES.txt               | 3 +++
 .../hadoop-common/src/site/markdown/SingleCluster.md.vm       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 891500fb6cd..6c6ba7577a3 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -893,6 +893,9 @@ Release 2.7.3 - UNRELEASED
 
     HADOOP-12482. Race condition in JMX cache update. (Tony Wu via lei)
 
+    HADOOP-12565. Replace DSA with RSA for SSH key type in SingleCluster.md.
+    (Mingliang Liu via aajisaka)
+
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/SingleCluster.md.vm b/hadoop-common-project/hadoop-common/src/site/markdown/SingleCluster.md.vm
index 20a202f552c..2871be65685 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/SingleCluster.md.vm
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/SingleCluster.md.vm
@@ -137,8 +137,8 @@ Now check that you can ssh to the localhost without a passphrase:
 
 If you cannot ssh to localhost without a passphrase, execute the following commands:
 
-      $ ssh-keygen -t dsa -P '' -f ~/.ssh/id_dsa
-      $ cat ~/.ssh/id_dsa.pub >> ~/.ssh/authorized_keys
+      $ ssh-keygen -t rsa -P '' -f ~/.ssh/id_rsa
+      $ cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
       $ chmod 0600 ~/.ssh/authorized_keys
 
 $H3 Execution