Author: wang Date: Thu Jun 19 18:32:13 2014 New Revision: 1603993 URL: http://svn.apache.org/r1603993 Log: Merge from trunk to branch
Modified:
hadoop/common/branches/fs-encryption/ (props changed)
Propchange: hadoop/common/branches/fs-encryption/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1603664-1603978
