| commit | 834fccf02b5202176f3c0a5e580c46855ca5d1d5 | [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 | d2a39b61aa78cf75bf9481405e9700fac1852df0 [diff] | |
| parent | f20d36312681658f12c3fad49a8c0deddfa5f333 [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