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 1556690 ../YARN-321


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

hadoop-yarn-project/CHANGES.txt

@@ -454,6 +454,9 @@ Branch YARN-321: Generic ApplicationHistoryService
   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

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml

@@ -112,7 +112,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>