commit | d2a39b61aa78cf75bf9481405e9700fac1852df0 | [log] [tgz] |
---|---|---|
author | Andrew Wang <wang@apache.org> | Wed Aug 20 01:22:42 2014 +0000 |
committer | Andrew Wang <wang@apache.org> | Wed Aug 20 01:22:42 2014 +0000 |
tree | e4c7e2f6bc495940a9f503ae92c00ed0f40bdca4 | |
parent | a4ee77b65f31351b4eae76ba5df0681a0d2b856f [diff] | |
parent | f6a778c3725bcdaba1e1de43786af17dd44deb78 [diff] |
Merge from trunk to branch. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1619018 13f79535-47bb-0310-9956-ffa450edef68