| commit | 3c2d550a9f2d052e242393dd01e4c9a6ce62f9a8 | [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 | 2675a1906d98a0561297c70c07c5c84d97ccbbb6 [diff] | |
| parent | 5ecd54a7f00a089ef5583efec9c180d6a391eb4d [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