Author: zjshen
Date: Thu Jan 9 01:04:47 2014
New Revision: 1556690
URL: http://svn.apache.org/r1556690
Log:
YARN-962. Fixed bug in application-history proto file and renamed it be just a
client proto file. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1506401 ../../branches/YARN-321-old/
Modified:
hadoop/common/branches/YARN-321/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/CHANGES.txt?rev=1556690&r1=1556689&r2=1556690&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/CHANGES.txt Thu Jan 9
01:04:47 2014
@@ -402,6 +402,9 @@ Branch YARN-321: Generic ApplicationHist
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)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml?rev=1556690&r1=1556689&r2=1556690&view=diff
==============================================================================
---
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
(original)
+++
hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
Thu Jan 9 01:04:47 2014
@@ -62,7 +62,7 @@
<include>containermanagement_protocol.proto</include>
<include>server/yarn_server_resourcemanager_service_protos.proto</include>
<include>server/resourcemanager_administration_protocol.proto</include>
-
<include>src/main/proto/application_history_service.proto</include>
+ <include>application_history_client.proto</include>
</includes>
</source>
<output>${project.build.directory}/generated-sources/java</output>
