HDFS-8831. Trash Support for deletion in HDFS encryption zone. Contributed by
Xiaoyu Yao.
(cherry picked from commit cbc7b6bf97a80c39d4bbb3005e42dacae6726baf)
(cherry picked from commit eb7f9901b4355c5488172dc93f734ee496b3e4dc)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
HDFS-8831. Trash Support for deletion in HDFS encryption zone. Contributed by
Xiaoyu Yao.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cbc7b6bf
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cbc7b6bf
Diff:
Repository: hadoop
Updated Branches:
refs/heads/branch-2 496c8969d -> eb7f9901b
HDFS-8831. Trash Support for deletion in HDFS encryption zone. Contributed by
Xiaoyu Yao.
(cherry picked from commit cbc7b6bf97a80c39d4bbb3005e42dacae6726baf)
Project: