Stop using ssh options by default that are not yet in widely used versions of ssh. Folks can still enable their use by uncommenting a line in conf/hadoop-env.sh.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@393261 13f79535-47bb-0310-9956-ffa450edef68

bin/slaves.sh

@@ -8,6 +8,7 @@
 #     Default is ${HADOOP_CONF_DIR}/slaves.
 #   HADOOP_CONF_DIR  Alternate conf dir. Default is ${HADOOP_HOME}/conf.
 #   HADOOP_SLAVE_SLEEP Seconds to sleep between spawning remote commands.
+#   HADOOP_SSH_OPTS Options passed to ssh when running remote commands.
 ##
 
 usage="Usage: slaves.sh command..."
@@ -44,15 +45,6 @@ if [ "$HADOOP_SLAVES" = "" ]; then
   export HADOOP_SLAVES="${HADOOP_CONF_DIR}/slaves"
 fi
 
-# By default, forward HADOOP_CONF_DIR environment variable to the
-# remote slave. Remote slave must have following added to its
-# /etc/ssh/sshd_config:
-#   AcceptEnv HADOOP_CONF_DIR
-# See'man ssh_config for more on SendEnv and AcceptEnv.
-if [ "$HADOOP_SSH_OPTS" = "" ]; then
-  export HADOOP_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HADOOP_CONF_DIR"
-fi
-
 for slave in `cat "$HADOOP_SLAVES"`; do
  ssh $HADOOP_SSH_OPTS $slave $"${@// /\\ }" \
    2>&1 | sed "s/^/$slave: /" &

conf/hadoop-env.sh.template

@@ -14,7 +14,7 @@
 # Extra Java runtime options.  Empty by default.
 # export HADOOP_OPTS=-server
 
-# Extra ssh options.  Default: '-o ConnectTimeout=1 -o SendEnv=HADOOP_CONF_DIR'.
+# Extra ssh options.  Empty by default.
 # export HADOOP_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HADOOP_CONF_DIR"
 
 # Where log files are stored.  $HADOOP_HOME/logs by default.