HADOOP-8562. CHANGES.txt cleanup related to merging the related jiras to branch-2

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

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -88,9 +88,6 @@ Release 2.0.5-beta - UNRELEASED
     HADOOP-9150. Avoid unnecessary DNS resolution attempts for logical URIs
     (todd)
 
-    HADOOP-9540. Expose the InMemoryS3 and S3N FilesystemStores implementations
-    for Unit testing. (Hari via stevel)
-
   BUG FIXES
 
     HADOOP-9294. GetGroupsTestBase fails on Windows. (Chris Nauroth via suresh)
@@ -351,9 +348,12 @@ Release 2.0.5-beta - UNRELEASED
     HADOOP-9413. Add common utils for File#setReadable/Writable/Executable &
     File#canRead/Write/Execute that work cross-platform. (Ivan Mitic via suresh)
 
-    HADOOP-9043. Disallow in winutils creating symlinks with forwards slashes.
+    HADOOP-9532. HADOOP_CLIENT_OPTS is appended twice by Windows cmd scripts.
     (Chris Nauroth via suresh)
 
+    HADOOP-9043. Disallow in winutils creating symlinks with forwards slashes.
+    (Chris Nauroth and Arpit Agarwal via suresh)
+
     HADOOP-9483. winutils support for readlink command.
     (Arpit Agarwal via suresh)
     
@@ -367,7 +367,7 @@ Release 2.0.5-beta - UNRELEASED
     HADOOP-9553. TestAuthenticationToken fails on Windows.
     (Arpit Agarwal via suresh)
 
-Release 2.0.4.1-alpha - UNRELEASED
+Release 2.0.4-alpha - 2013-04-25 
 
   INCOMPATIBLE CHANGES
 
@@ -395,7 +395,7 @@ Release 2.0.4-alpha - 2013-04-25
   BUG FIXES
 
     HADOOP-9467. Metrics2 record filter should check name as well as tags.
-    (Ganeshan Iyler via llu)
+    (Chris Nauroth and Ganeshan Iyler via llu)
 
     HADOOP-9406. hadoop-client leaks dependency on JDK tools jar. (tucu)
 

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -18,10 +18,6 @@ Release 2.0.5-beta - UNRELEASED
 
     HDFS-4334. Add a unique id to INode.  (Brandon Li via szetszwo)
 
-    HADOOP-8562. Enhancements to support Hadoop on Windows Server and Windows
-    Azure environments. (See breakdown of tasks below for subtasks and
-    contributors)
-    
     HDFS-4339. Persist inode id in fsimage and editlog. (Brandon Li via
     suresh)
 
@@ -37,6 +33,10 @@ Release 2.0.5-beta - UNRELEASED
     HDFS-347. DFS read performance suboptimal when client co-located on nodes
     with data. (Colin Patrick McCabe via todd and atm)
 
+    HADOOP-8562. Enhancements to support Hadoop on Windows Server and Windows
+    Azure environments. (See breakdown of tasks below for subtasks and
+    contributors)
+    
   IMPROVEMENTS
 
     HDFS-4222. NN is unresponsive and loses heartbeats from DNs when 
@@ -116,6 +116,9 @@ Release 2.0.5-beta - UNRELEASED
     HDFS-4804. WARN when users set the block balanced preference percent below
     0.5 or above 1.0. (Stephen Chu via atm)
 
+    HDFS-4698. Provide client-side metrics for remote reads, local reads, and
+    short-circuit reads. (Colin Patrick McCabe via atm)
+
   OPTIMIZATIONS
 
   BUG FIXES
@@ -186,9 +189,6 @@ Release 2.0.5-beta - UNRELEASED
     HDFS-4620. Documentation for dfs.namenode.rpc-address specifies wrong
     format. (Sandy Ryza via atm)
 
-    HDFS-4607. In TestGetConf.testGetSpecificKey(), use a platform-specific
-    line separator; otherwise, it fails on Windows.  (Ivan Mitic via szetszwo)
-
     HDFS-4609. TestAuditLogs should release log handles between tests. 
     (Ivan Mitic via szetszwo)
 
@@ -237,6 +237,8 @@ Release 2.0.5-beta - UNRELEASED
     HDFS-4748. MiniJournalCluster#restartJournalNode leaks resources, which 
     causes sporadic test failures. (Chris Nauroth via suresh)
 
+    HDFS-4733. Make HttpFS username pattern configurable. (tucu via atm)
+
     HDFS-4778. Fixes some issues that the first patch on HDFS-2576 missed.
     (ddas)
 
@@ -255,6 +257,7 @@ Release 2.0.5-beta - UNRELEASED
 
     HDFS-4533. start-dfs.sh ignores additional parameters besides -upgrade.
     (Fengdong Yu via suresh)
+
     HDFS-4765. Permission check of symlink deletion incorrectly throws
     UnresolvedLinkException. (Andrew Wang via atm)
 
@@ -270,11 +273,13 @@ Release 2.0.5-beta - UNRELEASED
     HDFS-4787. Create a new HdfsConfiguration before each TestDFSClientRetries
     testcases. (Tian Hong Wang via atm)
 
+    HDFS-4830. Typo in config settings for AvailableSpaceVolumeChoosingPolicy
+    in hdfs-default.xml. (atm)
+
     HDFS-4824. FileInputStreamCache.close leaves dangling reference to
     FileInputStreamCache.cacheCleaner. (Colin Patrick McCabe via todd)
 
-    HDFS-4693. Some test cases in TestCheckpoint do not clean up after 
-    themselves. (Arpit Agarwal, suresh via suresh)
+    HDFS-4298. StorageRetentionManager spews warnings when used with QJM. (atm)
 
     HDFS-4725. Fix HDFS file handle leaks in FSEditLog, NameNode,
     OfflineEditsBinaryLoader and some tests.  (Chris Nauroth via szetszwo)
@@ -338,7 +343,7 @@ Release 2.0.5-beta - UNRELEASED
     HDFS-4661. A few little code cleanups of some HDFS-347-related code. (Colin
     Patrick McCabe via atm)
 
-  BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
+  BREAKDOWN OF HADOOP-8562 and HDFS-3602 SUBTASKS AND RELATED JIRAS
 
     HDFS-4145. Merge hdfs cmd line scripts from branch-1-win. (David Lao,
     Bikas Saha, Lauren Yang, Chuan Liu, Thejas M Nair and Ivan Mitic via suresh)
@@ -369,18 +374,18 @@ Release 2.0.5-beta - UNRELEASED
     HDFS-4607.  In TestGetConf.testGetSpecificKey(), use a platform-specific
     line separator; otherwise, it fails on Windows.  (Ivan Mitic via szetszwo)
 
-    HDFS-4615. Fix TestDFSShell failures on Windows.  (Arpit Agarwal
-    via szetszwo)
-
-    HDFS-4584. Skip TestNNWithQJM.testNewNamenodeTakesOverWriter() on Windows.
-    (Arpit Agarwal via szetszwo)
-
     HDFS-4625. Make TestNNWithQJM#testNewNamenodeTakesOverWriter work on
     Windows. (Ivan Mitic via suresh)
 
     HDFS-4674. TestBPOfferService fails on Windows due to failure parsing 
     datanode data directory as URI. (Chris Nauroth via suresh)
 
+    HDFS-4615. Fix TestDFSShell failures on Windows.  (Arpit Agarwal
+    via szetszwo)
+
+    HDFS-4584. Skip TestNNWithQJM.testNewNamenodeTakesOverWriter() on Windows.
+    (Arpit Agarwal via szetszwo)
+
     HDFS-4732. Fix TestDFSUpgradeFromImage which fails on Windows due to
     failure to unpack old image tarball that contains hard links.
     (Chris Nauroth via szetszwo)

hadoop-mapreduce-project/CHANGES.txt

@@ -27,162 +27,6 @@ Release 2.0.5-beta - UNRELEASED
 
   IMPROVEMENTS
 
-<<<<<<< .working
-=======
-    MAPREDUCE-3481. [Gridmix] Improve Gridmix STRESS mode. (amarrk)
-
-    MAPREDUCE-3597. [Rumen] Rumen should provide APIs to access all the
-                    job-history related information.
-
-    MAPREDUCE-3375. [Gridmix] Memory Emulation system tests.
-                    (Vinay Thota via amarrk)
-
-    MAPREDUCE-2733. [Gridmix] Gridmix3 cpu emulation system tests.
-                    (Vinay Thota via amarrk)
-
-    MAPREDUCE-2836. Provide option to fail jobs when submitted to non-existent
-    fair scheduler pools. (Ahmed Radwan via todd)
-
-    MAPREDUCE-3171. normalize nodemanager native code compilation with common/hdfs
-    native. (tucu)
-
-    MAPREDUCE-3149. Add a test to verify that TokenCache handles file system
-    uri with no authority. (John George via jitendra)
-
-    MAPREDUCE-3169. Create a new MiniMRCluster equivalent which only provides
-    client APIs cross MR1 and MR2 (Ahmed via tucu)
-
-    MAPREDUCE-2944. Improve checking of input for JobClient.displayTasks()
-    (XieXianshan via harsh)
-
-    MAPREDUCE-3956. Remove the use of the deprecated Syncable.sync() method from
-    TeraOutputFormat in the terasort example.  (szetszwo)
-
-    MAPREDUCE-3935. Annotate Counters.Counter and Counters.Group as @Public.
-    (tomwhite)
-
-    HADOOP-8285 MR changes for Use ProtoBuf for RpcPayLoadHeader (sanjay radia)
-
-    MAPREDUCE-3302. Remove the last dependency call from
-    org.apache.hadoop.record package in MR. (harsh)
-
-    MAPREDUCE-2384. The job submitter should make sure to validate
-    jobs before creation of necessary files. (harsh)
-
-    MAPREDUCE-4371. Check for cyclic dependencies in Jobcontrol job DAG
-    (madhukara phatak via bobby)
-
-    MAPREDUCE-4686. hadoop-mapreduce-client-core fails compilation in Eclipse 
-    due to missing Avro-generated classes (Chris Nauroth via harsh)
-
-    MAPREDUCE-4735. Make arguments in TestDFSIO case insensitive.
-    (Brandon Li via suresh)
-
-    MAPREDUCE-5014. Extend Distcp to accept a custom CopyListing.
-    (Srikanth Sundarrajan via amareshwari)
-
-  BUG FIXES
-
-    MAPREDUCE-4272. SortedRanges.Range#compareTo is not spec compliant.
-    (Yu Gao via llu)
-
-    MAPREDUCE-3194. "mapred mradmin" command is broken in mrv2
-                     (Jason Lowe via bobby)
-
-    MAPREDUCE-3462. Fix Gridmix JUnit testcase failures.
-                    (Ravi Prakash and Ravi Gummadi via amarrk)
-
-    MAPREDUCE-3349. Log rack-name in JobHistory for unsuccessful tasks.
-                    (Devaraj K and Amar Kamat via amarrk)
-
-    MAPREDUCE-3412. Fix 'ant docs'. (amarrk)
-
-    MAPREDUCE-3346. [Rumen] LoggedTaskAttempt#getHostName() returns null.
-                    (amarrk)
-
-    MAPREDUCE-2950. [Gridmix] TestUserResolve fails in trunk.
-                    (Ravi Gummadi via amarrk)
-
-    MAPREDUCE-2784. [Gridmix] Bug fixes in ExecutionSummarizer and
-    ResourceUsageMatcher. (amarrk)
-
-    MAPREDUCE-2978. Fixed test-patch to make Jenkins report correct number of
-    findBugs, correct links to findBugs artifacts and no links to the
-    artifacts when there are no warnings. (Tom White via vinodkv).
-
-    MAPREDUCE-3664. Federation Documentation has incorrect configuration example.
-    (Brandon Li via jitendra)
-
-    MAPREDUCE-1740. NPE in getMatchingLevelForNodes when node locations are 
-    variable depth (ahmed via tucu) [IMPORTANT: this is dead code in trunk]
-
-    MAPREDUCE-3990. MRBench allows Long-sized input-lines value
-    but parses CLI argument as an Integer. (harsh)
-
-    MAPREDUCE-3868. Make Raid Compile. (Weiyan Wang via schen)
-
-    MAPREDUCE-4685. DBCount should not use ACCESS. (Viji via harsh)
-
-    MAPREDUCE-3223. Remove MR1 configs from mapred-default.xml (tlipcon via harsh)
-
-    MAPREDUCE-4695. Fix LocalRunner on trunk after MAPREDUCE-3223 broke it
-    (harsh)
-
-    MAPREDUCE-4574. Fix TotalOrderParitioner to work with
-    non-WritableComparable key types. (harsh)
-
-    MAPREDUCE-4884. Streaming tests fail to start MiniMRCluster due to missing
-    queue configuration. (Chris Nauroth via suresh)
-
-    MAPREDUCE-5012. Typo in javadoc for IdentityMapper class. (Adam Monsen
-    via suresh)
-
-    MAPREDUCE-5078. TestMRAppMaster fails on Windows due to mismatched path
-    separators. (Chris Nauroth via sseth)
-
-    MAPREDUCE-4885. Streaming tests have multiple failures on Windows. (Chris
-    Nauroth via bikas)
-
-    MAPREDUCE-4987. TestMRJobs#testDistributedCache fails on Windows due to
-    classpath problems and unexpected behavior of symlinks (Chris Nauroth via
-    bikas)
-
-    MAPREDUCE-5191. TestQueue#testQueue fails with timeout on Windows. (Ivan
-    Mitic via hitesh)
-
-  BREAKDOWN OF HADOOP-8562 SUBTASKS
-
-    MAPREDUCE-4739. Some MapReduce tests fail to find winutils.
-    (Chris Nauroth via suresh)
-
-    MAPREDUCE-4780. MapReduce distribution build fails on Windows.
-    (Chris Nauroth via suresh)
-
-    MAPREDUCE-4790. MapReduce build script would be more readable using abspath.
-    (Chris Nauroth via suresh)
-
-    MAPREDUCE-4869. Fix TestMapReduceChildJVM. (Chris Nauroth via acmurthy)
-
-    MAPREDUCE-4870. Fix TestMRJobsWithHistoryService. (Chris Nauroth via acmurthy)
-
-    MAPREDUCE-4983. Fixed various platform specific assumptions in various tests,
-    so that they can pass on Windows too. (Chris Nauroth via vinodkv)
-
-    HADOOP-9372. Fix bad timeout annotations on tests.
-    (Arpit Agarwal via suresh)
-
-    MAPREDUCE-5177. Use common utils FileUtil#setReadable/Writable/Executable & 
-    FileUtil#canRead/Write/Execute. (Ivan Mitic via suresh)
-
-Release 2.0.5-beta - UNRELEASED
-
-  INCOMPATIBLE CHANGES
-
-  NEW FEATURES
-
-  IMPROVEMENTS
-
->>>>>>> .merge-right.r1467158
     MAPREDUCE-3008. Improvements to cumulative CPU emulation for short running
     tasks in Gridmix. (amarrk via tgraves)
 
@@ -474,7 +318,10 @@ Release 2.0.5-beta - UNRELEASED
     MAPREDUCE-4885. Streaming tests have multiple failures on Windows. (Chris
     Nauroth via bikas)
 
-Release 2.0.4.1-alpha - UNRELEASED
+    MAPREDUCE-5177. Use common utils FileUtil#setReadable/Writable/Executable & 
+    FileUtil#canRead/Write/Execute. (Ivan Mitic via suresh)
+
+Release 2.0.4-alpha - 2013-04-25
 
   INCOMPATIBLE CHANGES
 

hadoop-yarn-project/CHANGES.txt

@@ -16,7 +16,7 @@ Release 2.0.5-beta - UNRELEASED
 
     YARN-486. Changed NM's startContainer API to accept Container record given by
     RM as a direct parameter instead of as part of the ContainerLaunchContext
-    record. (Xuan Gong via vinodkv) 
+    record. (Xuan Gong via vinodkv)
 
     YARN-444. Moved special container exit codes from YarnConfiguration to API
     where they belong. (Sandy Ryza via vinodkv)
@@ -342,7 +342,7 @@ Release 2.0.5-beta - UNRELEASED
     YARN-715. Fixed unit test failures - TestDistributedShell and
     TestUnmanagedAMLauncher. (Vinod Kumar Vavilapalli via sseth)
 
-  BREAKDOWN OF HADOOP-8562 SUBTASKS
+  BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
 
     YARN-158. Yarn creating package-info.java must not depend on sh.
     (Chris Nauroth via suresh)
@@ -372,6 +372,9 @@ Release 2.0.5-beta - UNRELEASED
     YARN-359. Fixing commands for container signalling in Windows. (Chris Nauroth
     via vinodkv)
 
+    YARN-506. Move to common utils FileUtil#setReadable/Writable/Executable and 
+    FileUtil#canRead/Write/Execute. (Ivan Mitic via suresh)
+
     YARN-488. TestContainerManagerSecurity fails on Windows. (Chris Nauroth
     via hitesh)
 
@@ -379,9 +382,6 @@ Release 2.0.5-beta - UNRELEASED
 
     YARN-491. TestContainerLogsPage fails on Windows. (Chris Nauroth via hitesh)
 
-    YARN-557. Fix TestUnmanagedAMLauncher failure on Windows. (Chris Nauroth via
-    vinodkv)
-
     YARN-487. Modify path manipulation in LocalDirsHandlerService to let
     TestDiskFailures pass on Windows. (Chris Nauroth via vinodkv)
 
@@ -392,9 +392,6 @@ Release 2.0.5-beta - UNRELEASED
     YARN-493. Fixed some shell related flaws in YARN on Windows. (Chris Nauroth
     via vinodkv)
 
-    YARN-506. Move to common utils FileUtil#setReadable/Writable/Executable and 
-    FileUtil#canRead/Write/Execute. (Ivan Mitic via suresh)
-
 Release 2.0.4-alpha - 2013-04-25 
 
   INCOMPATIBLE CHANGES