diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index e710739d228..f7d7f9f1b4c 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -197,6 +197,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) 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 db0a25f7e4f..be557a73293 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 --------------------------------