Author: vinodkv
Date: Tue Jan 28 20:11:48 2014
New Revision: 1562212
URL: http://svn.apache.org/r1562212
Log:
Fixing YARN CHANGES.txt issues with the previous commit.
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1562212&r1=1562211&r2=1562212&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Tue Jan 28
20:11:48 2014
@@ -519,87 +519,9 @@ 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)
-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)
-
-=======
->>>>>>> .merge-right.r1557889
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
