Author: wang Date: Thu Jul 24 23:55:15 2014 New Revision: 1613334 URL: http://svn.apache.org/r1613334 Log: Merge from trunk to branch
Modified:
hadoop/common/branches/fs-encryption/ (props changed)
Propchange: hadoop/common/branches/fs-encryption/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1612916-1613333
