tree e4c7e2f6bc495940a9f503ae92c00ed0f40bdca4
parent a4ee77b65f31351b4eae76ba5df0681a0d2b856f
parent f6a778c3725bcdaba1e1de43786af17dd44deb78
author Andrew Wang <wang@apache.org> 1408497762 +0000
committer Andrew Wang <wang@apache.org> 1408497762 +0000

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