Repository: hadoop Updated Branches: refs/heads/trunk eb92cc67d -> fe2f54d4c
HADOOP-11106. Document considerations of HAR and Encryption. (clamb via wang) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fe2f54d4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fe2f54d4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fe2f54d4 Branch: refs/heads/trunk Commit: fe2f54d4cbd4b02bc3b8f642d0689b17dbfe169b Parents: eb92cc6 Author: Andrew Wang <w...@apache.org> Authored: Thu Sep 18 14:51:08 2014 -0700 Committer: Andrew Wang <w...@apache.org> Committed: Thu Sep 18 14:51:08 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../src/site/markdown/HadoopArchives.md.vm | 5 +++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fe2f54d4/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 0ca2953..2eb7d70 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -533,6 +533,8 @@ Release 2.6.0 - UNRELEASED HADOOP-11016. KMS should support signing cookies with zookeeper secret manager. (tucu) + HADOOP-11106. Document considerations of HAR and Encryption. (clamb via wang) + OPTIMIZATIONS HADOOP-10838. Byte array native checksumming. (James Thomas via todd) http://git-wip-us.apache.org/repos/asf/hadoop/blob/fe2f54d4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/HadoopArchives.md.vm ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/HadoopArchives.md.vm b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/HadoopArchives.md.vm index db0a25f..be557a7 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/HadoopArchives.md.vm +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/HadoopArchives.md.vm @@ -59,6 +59,11 @@ How to Create an Archive `hadoop archive -archiveName zoo.har -p /foo/bar -r 3 /outputdir` + If you specify source files that are in an encryption zone, they will be + decrypted and written into the archive. If the har file is not located in an + encryption zone, then they will be stored in clear (decrypted) form. If the + har file is located in an encryption zone they will stored in encrypted form. + How to Look Up Files in Archives --------------------------------
