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 to...@apache.org on 2010/06/11 01:54:56 UTC
svn commit: r953506 - in /hadoop/common/branches/branch-0.21: CHANGES.txt
src/contrib/ec2/README.txt src/contrib/ec2/bin/hadoop-ec2
Author: tomwhite
Date: Thu Jun 10 23:54:55 2010
New Revision: 953506
URL: http://svn.apache.org/viewvc?rev=953506&view=rev
Log:
Merge -r 953503:953504 from trunk to branch-0.21. Fixes: HADOOP-6403
Modified:
hadoop/common/branches/branch-0.21/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.21/src/contrib/ec2/README.txt
hadoop/common/branches/branch-0.21/src/contrib/ec2/bin/hadoop-ec2
Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=953506&r1=953505&r2=953506&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Thu Jun 10 23:54:55 2010
@@ -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
Propchange: hadoop/common/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 23:54:55 2010
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,951614
+/hadoop/common/trunk/CHANGES.txt:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,951614,953504
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Modified: hadoop/common/branches/branch-0.21/src/contrib/ec2/README.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/contrib/ec2/README.txt?rev=953506&r1=953505&r2=953506&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/src/contrib/ec2/README.txt (original)
+++ hadoop/common/branches/branch-0.21/src/contrib/ec2/README.txt Thu Jun 10 23:54:55 2010
@@ -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
Modified: hadoop/common/branches/branch-0.21/src/contrib/ec2/bin/hadoop-ec2
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/contrib/ec2/bin/hadoop-ec2?rev=953506&r1=953505&r2=953506&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/src/contrib/ec2/bin/hadoop-ec2 (original)
+++ hadoop/common/branches/branch-0.21/src/contrib/ec2/bin/hadoop-ec2 Thu Jun 10 23:54:55 2010
@@ -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"