YARN-321. Relocating CHANGES.txt for the entries corresponding to YARN-321 branch for minimizing conflicts.

svn merge --ignore-ancestry -c 1557889 ../YARN-321


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

hadoop-yarn-project/CHANGES.txt

@@ -1,5 +1,80 @@
 Hadoop YARN Change Log
 
+Branch YARN-321: Generic ApplicationHistoryService
+
+  YARN-930. Bootstrapping ApplicationHistoryService module. (vinodkv)
+
+  YARN-935. Correcting pom.xml to build applicationhistoryserver module
+  successfully. (Zhijie Shen via vinodkv)
+
+  YARN-962. Fixed bug in application-history proto file and renamed it be just
+  a client proto file. (Zhijie Shen via vinodkv)
+
+  YARN-947. Implementing the data objects to be used by the History reader
+  and writer interfaces. (Zhijie Shen via vinodkv)
+
+  YARN-984. Renamed the incorrectly named applicationhistoryservice.records.pb.impl
+  package to be applicationhistoryservice.records.impl.pb. (Devaraj K via vinodkv)
+
+  YARN-934. Defined a Writer Interface for HistoryStorage. (Zhijie Shen via
+  vinodkv)
+
+  YARN-925. Defined a Reader Interface for HistoryStorage. (Mayank Bansal via
+  vinodkv)
+
+  YARN-978. Created ApplicationAttemptReport. (Mayank Bansal via vinodkv)
+
+  YARN-956. Added a testable in-memory HistoryStorage. (Mayank Bansal via
+  vinodkv)
+
+  YARN-1007. Enhance History Reader interface for Containers. (Mayank Bansal via
+  devaraj)
+
+  YARN-975. Added a file-system implementation for HistoryStorage. (Zhijie Shen
+  via vinodkv)
+
+  YARN-1123. Added a new ContainerReport and its Protobuf implementation. (Mayank
+  Bansal via vinodkv)
+
+  YARN-979. Added more APIs for getting information about ApplicationAttempts
+  and Containers from ApplicationHistoryProtocol. (Mayank Bansal and Zhijie Shen
+  via vinodkv)
+
+  YARN-974. Added more information to RMContainer to be collected and recorded in
+  Application-History. (Zhijie Shen via vinodkv)
+
+  YARN-987. Added ApplicationHistoryManager responsible for exposing reports to
+  all clients. (Mayank Bansal via vinodkv)
+
+  YARN-953. Changed ResourceManager to start writing history data. (Zhijie Shen
+  via vinodkv)
+
+  YARN-1266. Implemented PB service and client wrappers for
+  ApplicationHistoryProtocol. (Mayank Bansal via vinodkv)
+
+  YARN-955. Implemented ApplicationHistoryProtocol handler. (Mayank Bansal via
+  vinodkv)
+
+  YARN-1242. Changed yarn scripts to be able to start ApplicationHistoryServer
+  as an individual process. (Mayank Bansal via vinodkv)
+
+  YARN-954. Implemented web UI for the ApplicationHistoryServer and wired it into
+  the HistoryStorage. (Zhijie Shen via vinodkv)
+
+  YARN-967. Added the client and CLI interfaces for obtaining ApplicationHistory
+  data. (Mayank Bansal via vinodkv)
+
+  YARN-1023. Added Webservices REST APIs support for Application History. (Zhijie
+  Shen via vinodkv)
+
+  YARN-1534. Fixed failure of test TestAHSWebApp. (Shinichi Yamashita via vinodkv)
+
+  YARN-1413. Implemented serving of aggregated-logs in the ApplicationHistory
+  server. (Mayank Bansal via vinodkv)
+
+  YARN-1555. Fixed test failures in applicationhistoryservice.* (Vinod Kumar 
+  Vavilapalli via mayank)
+
 Release 2.4.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -444,6 +519,7 @@ Release 2.3.0 - UNRELEASED
     YARN-1438. Ensure container diagnostics includes exception from container
     launch. (stevel via acmurthy)
 
+<<<<<<< .working
     YARN-1138. yarn.application.classpath is set to point to $HADOOP_CONF_DIR
     etc., which does not work on Windows. (Chuan Liu via cnauroth)
 
@@ -522,6 +598,8 @@ Branch YARN-321: Generic ApplicationHistoryService
   YARN-1555. Fixed test failures in applicationhistoryservice.* (Vinod Kumar 
   Vavilapalli via mayank)
 
+=======
+>>>>>>> .merge-right.r1557889
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES