Revision 1615851

Jump to revision:
Author:	wang
Date:	Tue Aug 5 02:33:44 2014 UTC (10 years, 3 months ago)
Changed paths:	7
Log Message:	Merge from trunk to branch

Changed paths

Path	Details
hadoop/common/branches/fs-encryption/	modified , props changed
hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/CHANGES.txt	modified , text changed , props changed
hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/main/java/	modified , props changed
hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java	modified , text changed
hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyShell.java	modified , text changed
hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestKeyShell.java	modified , text changed
hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java	modified , text changed