Author: suresh
Date: Fri Jan 4 18:54:12 2013
New Revision: 1429030
URL: http://svn.apache.org/viewvc?rev=1429030&view=rev
Log:
HADOOP-9173. Merging changes r1428970 and r1428972 from trunk
Added:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/proto/Security.proto
- copied unchanged from r1428970,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/proto/Security.proto
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1429030&r1=1429029&r2=1429030&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Fri Jan 4 18:54:12 2013
@@ -109,6 +109,8 @@ Release 2.0.3-alpha - Unreleased
HADOOP-9162. Add utility to check native library availability.
(Binglin Chang via suresh)
+ HADOOP-9173. Add security token protobuf definition to common and
+ use it in hdfs. (suresh)
OPTIMIZATIONS
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml?rev=1429030&r1=1429029&r2=1429030&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
Fri Jan 4 18:54:12 2013
@@ -294,6 +294,10 @@
<!-- protobuf generated code -->
<Class name="~org\.apache\.hadoop\.ha\.proto\.ZKFCProtocolProtos.*"/>
</Match>
+ <Match>
+ <!-- protobuf generated code -->
+ <Class name="~org\.apache\.hadoop\.security\.proto\.SecurityProtos.*"/>
+ </Match>
<!--
Manually checked, misses child thread manually syncing on parent's
intrinsic lock.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml?rev=1429030&r1=1429029&r2=1429030&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml
(original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml
Fri Jan 4 18:54:12 2013
@@ -376,6 +376,7 @@
<argument>src/main/proto/RpcPayloadHeader.proto</argument>
<argument>src/main/proto/ZKFCProtocol.proto</argument>
<argument>src/main/proto/hadoop_rpc.proto</argument>
+ <argument>src/main/proto/Security.proto</argument>
</arguments>
</configuration>
</execution>
