svn merge -c 1212615 from trunk for HADOOP-7899.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230420 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 07:06:13 +00:00 · 2012-01-12 07:06:13 +00:00 · feef36a5e7
parent 0dac3d8f09
commit feef36a5e7
3 changed files with 2 additions and 1963 deletions
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@ -32,6 +32,8 @@ Release 0.23-PB - Unreleased
    HADOOP-7876. Provided access to encoded key in DelegationKey for
    use in protobuf based RPCs. (suresh)

+    HADOOP-7899. Generate proto java files as part of the build. (tucu)
+
  BUG FIXES

    HADOOP-7833. Fix findbugs warnings in protobuf generated code.
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/protobuf/HadoopRpcProtos.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/protobuf/HadoopRpcProtos.java
--- a/hadoop-common-project/hadoop-common/src/main/proto/hadoop_rpc.proto
+++ b/hadoop-common-project/hadoop-common/src/main/proto/hadoop_rpc.proto