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/05 01:52:50 UTC

svn commit: r951616 - in /hadoop/common/branches/branch-0.21: CHANGES.txt src/contrib/cloud/

Author: tomwhite
Date: Fri Jun  4 23:52:50 2010
New Revision: 951616

URL: http://svn.apache.org/viewvc?rev=951616&view=rev
Log:
Merge -r 951613:951614 from trunk to branch-0.21. Fixes: HADOOP-6780

Removed:
    hadoop/common/branches/branch-0.21/src/contrib/cloud/
Modified:
    hadoop/common/branches/branch-0.21/CHANGES.txt   (contents, props changed)

Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=951616&r1=951615&r2=951616&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Fri Jun  4 23:52:50 2010
@@ -236,15 +236,10 @@ Release 0.21.0 - Unreleased
     and the init of the class is made to take a Configuration argument.
     (Jakob Homan via ddas)
 
-    HADOOP-6108. Add support for EBS storage on EC2. (tomwhite)
-
     Hadoop-6223. Add new file system interface AbstractFileSystem with
     implementation of some file systems that delegate to old FileSystem.
     (Sanjay Radia via suresh)
 
-    HADOOP-6392. Run namenode and jobtracker on separate EC2 instances.
-    (tomwhite)
-
     HADOOP-6433. Introduce asychronous deletion of files via a pool of
     threads. This can be used to delete files in the Distributed
     Cache. (Zheng Shao via dhruba)
@@ -252,13 +247,9 @@ Release 0.21.0 - Unreleased
     HADOOP-6415. Adds a common token interface for both job token and 
     delegation token. (Kan Zhang via ddas)
 
-    HADOOP-6466. Add a ZooKeeper service to the cloud scripts. (tomwhite)
-
     HADOOP-6408. Add a /conf servlet to dump running configuration.
     (Todd Lipcon via tomwhite)
 
-    HADOOP-6464. Write a Rackspace cloud provider. (tomwhite)
-
     HADOOP-6520. Adds APIs to read/write Token and secret keys. Also
     adds the automatic loading of tokens into UserGroupInformation
     upon login. The tokens are read from a file specified in the
@@ -737,15 +728,8 @@ Release 0.21.0 - Unreleased
     HADOOP-6394. Add a helper class to simplify FileContext related tests and
     improve code reusability. (Jitendra Nath Pandey via suresh)
 
-    HADOOP-6426. Create ant build for running EC2 unit tests. (tomwhite)
-
     HADOOP-4656. Add a user to groups mapping service. (boryas, acmurthy)
 
-    HADOOP-6444. Support additional security group option in hadoop-ec2 script.
-    (Paul Egan via tomwhite)
-
-    HADOOP-6454. Create setup.py for EC2 cloud scripts. (tomwhite)
-
     HADOOP-6435. Make RPC.waitForProxy with timeout public. (Steve Loughran
     via tomwhite)
   
@@ -1500,9 +1484,6 @@ Release 0.21.0 - Unreleased
     HADOOP-6640. FileSystem.get() does RPC retries within a static
     synchronized block. (hairong)
 
-    HADOOP-6680. hadoop-cloud push command invokes proxy creation.
-    (Andrew Klochkov via tomwhite)
-
     HADOOP-6691. TestFileSystemCaching sometimes hangs. (hairong)
 
     HADOOP-6507. Hadoop Common Docs - delete 3 doc files that do not belong

Propchange: hadoop/common/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  4 23:52:50 2010
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259
+/hadoop/common/trunk/CHANGES.txt:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,951614
 /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