Merge -r 953503:953504 from trunk to branch-0.21. Fixes: HADOOP-6403

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.21@953506 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -856,6 +856,8 @@ Release 0.21.0 - Unreleased
 
     HADOOP-6794. Move configuration and script files post split. (tomwhite)
 
+    HADOOP-6403.  Deprecate EC2 bash scripts.  (tomwhite)
+
   OPTIMIZATIONS
 
     HADOOP-5595. NameNode does not need to run a replicator to choose a

src/contrib/ec2/README.txt

@@ -1,5 +1,7 @@
 Hadoop EC2
 
+NOTE: these scripts have been deprecated. See http://incubator.apache.org/whirr.
+
 This collection of scripts allows you to run Hadoop clusters on Amazon.com's Elastic Compute Cloud (EC2) service described at:
 
   http://aws.amazon.com/ec2

src/contrib/ec2/bin/hadoop-ec2

@@ -20,6 +20,8 @@ set -o errexit
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
+echo "DEPRECATED. See http://incubator.apache.org/whirr." >&2
+
 # if no args specified, show usage
 if [ $# = 0 ]; then
   echo "Usage: hadoop-ec2 COMMAND"