| commit | eb14192ab9d8dee1ab750a2a5b73019fa41ab7ad | [log] [tgz] |
|---|---|---|
| author | Andrew Wang <wang@apache.org> | Wed Aug 20 18:19:13 2014 +0000 |
| committer | Andrew Wang <wang@apache.org> | Wed Aug 20 18:19:13 2014 +0000 |
| tree | c1681d68a9a1e90539b9ce496284b6028faaef5b | |
| parent | 3c2d550a9f2d052e242393dd01e4c9a6ce62f9a8 [diff] | |
| parent | acf498927452575f03e058daa32ed0773a5da44f [diff] |
Merge from trunk to branch git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1619194 13f79535-47bb-0310-9956-ffa450edef68