tree c1681d68a9a1e90539b9ce496284b6028faaef5b
parent d2a39b61aa78cf75bf9481405e9700fac1852df0
parent f20d36312681658f12c3fad49a8c0deddfa5f333
author Andrew Wang <wang@apache.org> 1408558753 +0000
committer Andrew Wang <wang@apache.org> 1408558753 +0000

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