HADOOP-9373. Merge CHANGES.branch-trunk-win.txt to CHANGES.txt. Contributed by Suresh Srinivas.

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

hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt

@@ -1,111 +0,0 @@
-branch-trunk-win changes - unreleased
-
-  HADOOP-8924. Hadoop Common creating package-info.java must not depend on sh.
-  (Chris Nauroth via suresh)
-
-  HADOOP-8945. Merge winutils from branch-1-win to branch-trunk-win.
-  (Bikas Saha, Chuan Liu, Giridharan Kesavan, Ivan Mitic, and Steve Maine
-  ported by Chris Nauroth via suresh)
-
-  HADOOP-8946. winutils: compile codebase during Maven build on 
-  branch-trunk-win. (Chris Nauroth via suresh)
-
-  HADOOP-8947. Merge FileUtil and Shell changes from branch-1-win to 
-  branch-trunk-win to enable initial test pass. (Raja Aluri, Davio Lao, 
-  Sumadhur Reddy Bolli, Ahmed El Baz, Kanna Karanam, Chuan Liu, 
-  Ivan Mitic, Chris Nauroth, and Bikas Saha via suresh)
-
-  HADOOP-8954. "stat" executable not found on Windows. (Bikas Saha, Ivan Mitic
-  ported by Chris Narouth via suresh)
-
-  HADOOP-8959. TestUserGroupInformation fails on Windows due to "id" executable
-  not found. (Bikas Saha, Ivan Mitic, ported by Chris Narouth via suresh)
-
-  HADOOP-8955. "chmod" executable not found on Windows.
-  (Chris Nauroth via suresh)
-
-  HADOOP-8960. TestMetricsServlet fails on Windows. (Ivan Mitic via suresh)
-
-  HADOOP-8961. GenericOptionsParser URI parsing failure on Windows.
-  (Ivan Mitic via suresh)
-
-  HADOOP-8949. Remove FileUtil.CygPathCommand dead code. (Chris Nauroth via 
-  suresh)
-
-  HADOOP-8956. FileSystem.primitiveMkdir failures on Windows cause multiple
-  test suites to fail. (Chris Nauroth via suresh)
-
-  HADOOP-8978. TestTrash fails on Windows. (Chris Nauroth via suresh)
-
-  HADOOP-8979. TestHttpServer fails on Windows. (Chris Nauroth via suresh)
-
-  HADOOP-8953. Shell PathData parsing failures on Windows. (Arpit Agarwal via
-  suresh)
-
-  HADOOP-8975. TestFileContextResolveAfs fails on Windows. (Chris Nauroth via
-  suresh)
-
-  HADOOP-8977. Multiple FsShell test failures on Windows. (Chris Nauroth via
-  suresh)
-
-  HADOOP-9005. Merge hadoop cmd line scripts from branch-1-win. (David Lao, 
-  Bikas Saha, Lauren Yang, Chuan Liu, Thejas M Nair and Ivan Mitic via suresh)
-
-  HADOOP-9008. Building hadoop tarball fails on Windows. (Chris Nauroth via
-  suresh)
-
-  HADOOP-9011. saveVersion.py does not include branch in version annotation.
-  (Chris Nauroth via suresh)
-
-  HADOOP-9110. winutils ls off-by-one error indexing MONTHS array can cause 
-  access violation. (Chris Nauroth via suresh)
-
-  HADOOP-9056. Build native library on Windows. (Chuan Liu, Arpit Agarwal via
-  suresh)
-
-  HADOOP-9144. Fix findbugs warnings. (Chris Nauroth via suresh)
-
-  HADOOP-9081. Add TestWinUtils. (Chuan Liu, Ivan Mitic, Chris Nauroth, 
-  and Bikas Saha via suresh)
-
-  HADOOP-9146. Fix sticky bit regression on branch-trunk-win.
-  (Chris Nauroth via suresh)
-
-  HADOOP-9266. Fix javac, findbugs, and release audit warnings on
-  branch-trunk-win. (Chris Nauroth via suresh)
-
-  HADOOP-9270. Remove a stale java comment from FileUtil. (Chris Nauroth via
-  szetszwo)
-
-  HADOOP-9271. Revert Python build scripts from branch-trunk-win.
-  (Chris Nauroth via suresh)
-
-  HADOOP-9313. Remove spurious mkdir from hadoop-config.cmd.
-  (Ivan Mitic via suresh)
-
-  HADOOP-9309. Test failures on Windows due to UnsatisfiedLinkError
-  in NativeCodeLoader#buildSupportsSnappy. (Arpit Agarwal via suresh)
-
-  HADOOP-9347. Add instructions to BUILDING.txt describing how to
-  build on Windows. (Chris Nauroth via suresh)
-
-  HADOOP-9348. Address TODO in winutils to add more command line usage
-  and examples. (Chris Nauroth via suresh)
-
-  HADOOP-9354. Windows native project files missing license headers.
-  (Chris Nauroth via suresh)
-
-  HADOOP-9356. Remove remaining references to cygwin/cygpath from scripts.
-  (Chris Nauroth via suresh)
-
-  HADOOP-9232. JniBasedUnixGroupsMappingWithFallback fails on Windows
-  with UnsatisfiedLinkError. (Ivan Mitic via suresh)
-
-  HADOOP-9368. Add timeouts to new tests in branch-trunk-win.
-  (Arpit Agarwal via suresh)
-
-Patch equivalent to trunk committed to branch-trunk-win
-
-  HADOOP-8924. Add maven plugin alternative to shell script to save
-  package-info.java. (Chris Nauroth via suresh)
-

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

@@ -20,6 +20,10 @@ Trunk (Unreleased)
     HADOOP-8470. Add NetworkTopologyWithNodeGroup, a 4-layer implementation
     of NetworkTopology.  (Junping Du via szetszwo)
 
+    HADOOP-8562. Enhancements to support Hadoop on Windows Server and Windows
+    Azure environments. (See breakdown of tasks below for subtasks and
+    contributors)
+
   IMPROVEMENTS
 
     HADOOP-8017. Configure hadoop-main pom to get rid of M2E plugin execution
@@ -340,6 +344,115 @@ Trunk (Unreleased)
 
     HADOOP-9190. packaging docs is broken. (Andy Isaacson via atm)
 
+  BREAKDOWN OF HADOOP-8562 SUBTASKS
+
+    HADOOP-8924. Hadoop Common creating package-info.java must not depend on
+    sh. (Chris Nauroth via suresh)
+
+    HADOOP-8945. Merge winutils from branch-1-win to branch-trunk-win.
+    (Bikas Saha, Chuan Liu, Giridharan Kesavan, Ivan Mitic, and Steve Maine
+    ported by Chris Nauroth via suresh)
+
+    HADOOP-8946. winutils: compile codebase during Maven build on 
+    branch-trunk-win. (Chris Nauroth via suresh)
+
+    HADOOP-8947. Merge FileUtil and Shell changes from branch-1-win to 
+    branch-trunk-win to enable initial test pass. (Raja Aluri, Davio Lao, 
+    Sumadhur Reddy Bolli, Ahmed El Baz, Kanna Karanam, Chuan Liu, 
+    Ivan Mitic, Chris Nauroth, and Bikas Saha via suresh)
+
+    HADOOP-8954. "stat" executable not found on Windows. (Bikas Saha, Ivan Mitic
+    ported by Chris Narouth via suresh)
+
+    HADOOP-8959. TestUserGroupInformation fails on Windows due to "id" executable
+    not found. (Bikas Saha, Ivan Mitic, ported by Chris Narouth via suresh)
+
+    HADOOP-8955. "chmod" executable not found on Windows.
+    (Chris Nauroth via suresh)
+
+    HADOOP-8960. TestMetricsServlet fails on Windows. (Ivan Mitic via suresh)
+
+    HADOOP-8961. GenericOptionsParser URI parsing failure on Windows.
+    (Ivan Mitic via suresh)
+
+    HADOOP-8949. Remove FileUtil.CygPathCommand dead code. (Chris Nauroth via 
+    suresh)
+
+    HADOOP-8956. FileSystem.primitiveMkdir failures on Windows cause multiple
+    test suites to fail. (Chris Nauroth via suresh)
+
+    HADOOP-8978. TestTrash fails on Windows. (Chris Nauroth via suresh)
+
+    HADOOP-8979. TestHttpServer fails on Windows. (Chris Nauroth via suresh)
+
+    HADOOP-8953. Shell PathData parsing failures on Windows. (Arpit Agarwal via
+    suresh)
+
+    HADOOP-8975. TestFileContextResolveAfs fails on Windows. (Chris Nauroth via
+    suresh)
+
+    HADOOP-8977. Multiple FsShell test failures on Windows. (Chris Nauroth via
+    suresh)
+
+    HADOOP-9005. Merge hadoop cmd line scripts from branch-1-win. (David Lao, 
+    Bikas Saha, Lauren Yang, Chuan Liu, Thejas M Nair and Ivan Mitic via suresh)
+
+    HADOOP-9008. Building hadoop tarball fails on Windows. (Chris Nauroth via
+    suresh)
+
+    HADOOP-9011. saveVersion.py does not include branch in version annotation.
+    (Chris Nauroth via suresh)
+
+    HADOOP-9110. winutils ls off-by-one error indexing MONTHS array can cause 
+    access violation. (Chris Nauroth via suresh)
+
+    HADOOP-9056. Build native library on Windows. (Chuan Liu, Arpit Agarwal via
+    suresh)
+
+    HADOOP-9144. Fix findbugs warnings. (Chris Nauroth via suresh)
+
+    HADOOP-9081. Add TestWinUtils. (Chuan Liu, Ivan Mitic, Chris Nauroth, 
+    and Bikas Saha via suresh)
+
+    HADOOP-9146. Fix sticky bit regression on branch-trunk-win.
+    (Chris Nauroth via suresh)
+
+    HADOOP-9266. Fix javac, findbugs, and release audit warnings on
+    branch-trunk-win. (Chris Nauroth via suresh)
+
+    HADOOP-9270. Remove a stale java comment from FileUtil. (Chris Nauroth via
+    szetszwo)
+
+    HADOOP-9271. Revert Python build scripts from branch-trunk-win.
+    (Chris Nauroth via suresh)
+
+    HADOOP-9313. Remove spurious mkdir from hadoop-config.cmd.
+    (Ivan Mitic via suresh)
+
+    HADOOP-9309. Test failures on Windows due to UnsatisfiedLinkError
+    in NativeCodeLoader#buildSupportsSnappy. (Arpit Agarwal via suresh)
+
+    HADOOP-9347. Add instructions to BUILDING.txt describing how to
+    build on Windows. (Chris Nauroth via suresh)
+
+    HADOOP-9348. Address TODO in winutils to add more command line usage
+    and examples. (Chris Nauroth via suresh)
+
+    HADOOP-9354. Windows native project files missing license headers.
+    (Chris Nauroth via suresh)
+
+    HADOOP-9356. Remove remaining references to cygwin/cygpath from scripts.
+    (Chris Nauroth via suresh)
+
+    HADOOP-9232. JniBasedUnixGroupsMappingWithFallback fails on Windows
+    with UnsatisfiedLinkError. (Ivan Mitic via suresh)
+
+    HADOOP-9368. Add timeouts to new tests in branch-trunk-win.
+    (Arpit Agarwal via suresh)
+
+    HADOOP-9373. Merge CHANGES.branch-trunk-win.txt to CHANGES.txt.
+    (suresh)
+
 Release 2.0.4-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-common-project/hadoop-common/pom.xml

@@ -439,7 +439,6 @@
         <configuration>
           <excludes>
             <exclude>CHANGES.txt</exclude>
-            <exclude>CHANGES.branch-trunk-win.txt</exclude>
             <exclude>.idea/**</exclude>
             <exclude>src/main/conf/*</exclude>
             <exclude>src/main/docs/**</exclude>

hadoop-hdfs-project/hadoop-hdfs/CHANGES.branch-trunk-win.txt

@@ -1,13 +0,0 @@
-branch-trunk-win changes - unreleased
-
-  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)
-
-  HDFS-4163. HDFS distribution build fails on Windows. (Chris Nauroth via
-  suresh)
-
-  HDFS-4316. branch-trunk-win contains test code accidentally added during 
-  work on fixing tests on Windows. (Chris Nauroth via suresh)
-
-  HDFS-4297. Fix issues related to datanode concurrent reading and writing on
-  Windows. (Arpit Agarwal, Chuan Liu via suresh)

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

@@ -22,6 +22,11 @@ Trunk (Unreleased)
 
     HDFS-4296. Reserve layout version for release 1.2.0. (suresh)
 
+    HADOOP-8562. Enhancements to support Hadoop on Windows Server and Windows
+    Azure environments. (See breakdown of tasks below for subtasks and
+    contributors)
+    
+
   IMPROVEMENTS
 
     HDFS-1620. Rename HdfsConstants -> HdfsServerConstants, FSConstants ->
@@ -302,6 +307,20 @@ Trunk (Unreleased)
     HDFS-4502. JsonUtil.toFileStatus(..) should check if the fileId property
     exists.  (Brandon Li via suresh)
 
+  BREAKDOWN OF HADOOP-8562 SUBTASKS
+
+    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)
+
+    HDFS-4163. HDFS distribution build fails on Windows. (Chris Nauroth via
+    suresh)
+
+    HDFS-4316. branch-trunk-win contains test code accidentally added during 
+    work on fixing tests on Windows. (Chris Nauroth via suresh)
+
+    HDFS-4297. Fix issues related to datanode concurrent reading and writing on
+    Windows. (Arpit Agarwal, Chuan Liu via suresh)
+
 Release 2.0.4-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-hdfs-project/hadoop-hdfs/pom.xml

@@ -515,7 +515,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
           <excludes>
             <exclude>CHANGES.txt</exclude>
             <exclude>CHANGES.HDFS-1623.txt</exclude>
-            <exclude>CHANGES.branch-trunk-win.txt</exclude>
             <exclude>.idea/**</exclude>
             <exclude>src/main/conf/*</exclude>
             <exclude>src/main/docs/**</exclude>

hadoop-mapreduce-project/CHANGES.branch-trunk-win.txt

@@ -1,17 +0,0 @@
-branch-trunk-win changes - unreleased
-
-  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-mapreduce-project/CHANGES.txt

@@ -14,6 +14,10 @@ Trunk (Unreleased)
     MAPREDUCE-4887. Add RehashPartitioner, to smooth distributions
     with poor implementations of Object#hashCode().  (Radim Kolar via cutting)
 
+    HADOOP-8562. Enhancements to support Hadoop on Windows Server and Windows
+    Azure environments. (See breakdown of tasks below for subtasks and
+    contributors)
+
   IMPROVEMENTS
 
     MAPREDUCE-3787. [Gridmix] Optimize job monitoring and STRESS mode for
@@ -155,6 +159,24 @@ Trunk (Unreleased)
     MAPREDUCE-5012. Typo in javadoc for IdentityMapper class. (Adam Monsen
     via suresh)
 
+  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)
+
 Release 2.0.4-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/pom.xml

@@ -210,7 +210,6 @@
           <excludes>
             <exclude>.eclipse.templates/</exclude>
             <exclude>CHANGES.txt</exclude>
-            <exclude>CHANGES.branch-trunk-win.txt</exclude>
             <exclude>lib/jdiff/**</exclude>
           </excludes>
         </configuration>

hadoop-yarn-project/CHANGES.branch-trunk-win.txt

@@ -1,29 +0,0 @@
-branch-trunk-win changes - unreleased
-
-  YARN-158. Yarn creating package-info.java must not depend on sh.
-  (Chris Nauroth via suresh)
-
-  YARN-176. Some YARN tests fail to find winutils. (Chris Nauroth via suresh)
-  
-  YARN-207. YARN distribution build fails on Windows. (Chris Nauroth via
-  suresh)
-
-  YARN-199. Yarn cmd line scripts for windows. (Ivan Mitic via suresh)
-
-  YARN-213. YARN build script would be more readable using abspath.
-  (Chris Nauroth via suresh)
-
-  YARN-233. Added support for running containers in MS Windows to YARN. (Chris
-  Nauroth via acmurthy)
-
-  YARN-234. Added support for process tree and resource calculator in MS Windows 
-  to YARN. (Chris Nauroth via acmurthy)
-
-  YARN-259. Fix LocalDirsHandlerService to use Path rather than URIs. (Xuan
-  Gong via acmurthy) 
-
-  YARN-316. YARN container launch may exceed maximum Windows command line 
-  length due to long classpath. (Chris Nauroth via suresh)
-
-  YARN-359. Fixing commands for container signalling in Windows. (Chris Nauroth
-  via vinodkv)

hadoop-yarn-project/CHANGES.txt

@@ -6,6 +6,10 @@ Trunk - Unreleased
 
   NEW FEATURES
 
+    HADOOP-8562. Enhancements to support Hadoop on Windows Server and Windows
+    Azure environments. (See breakdown of tasks below for subtasks and
+    contributors)
+
   IMPROVEMENTS
 
     YARN-84. Use Builder to build RPC server. (Brandon Li via suresh)
@@ -14,6 +18,36 @@ Trunk - Unreleased
 
   BUG FIXES
 
+  BREAKDOWN OF HADOOP-8562 SUBTASKS
+
+    YARN-158. Yarn creating package-info.java must not depend on sh.
+    (Chris Nauroth via suresh)
+
+    YARN-176. Some YARN tests fail to find winutils. (Chris Nauroth via suresh)
+    
+    YARN-207. YARN distribution build fails on Windows. (Chris Nauroth via
+    suresh)
+
+    YARN-199. Yarn cmd line scripts for windows. (Ivan Mitic via suresh)
+
+    YARN-213. YARN build script would be more readable using abspath.
+    (Chris Nauroth via suresh)
+
+    YARN-233. Added support for running containers in MS Windows to YARN. (Chris
+    Nauroth via acmurthy)
+
+    YARN-234. Added support for process tree and resource calculator in MS Windows 
+    to YARN. (Chris Nauroth via acmurthy)
+
+    YARN-259. Fix LocalDirsHandlerService to use Path rather than URIs. (Xuan
+    Gong via acmurthy) 
+
+    YARN-316. YARN container launch may exceed maximum Windows command line 
+    length due to long classpath. (Chris Nauroth via suresh)
+
+    YARN-359. Fixing commands for container signalling in Windows. (Chris Nauroth
+    via vinodkv)
+
 Release 2.0.4-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-yarn-project/pom.xml

@@ -197,7 +197,6 @@
         <configuration>
           <excludes>
             <exclude>CHANGES.txt</exclude>
-            <exclude>CHANGES.branch-trunk-win.txt</exclude>
           </excludes>
         </configuration>
       </plugin>