Repository: hadoop Updated Branches: refs/heads/branch-2 07b0abe0b -> ae29b1a17
MAPREDUCE-6655. Fix a typo (STRICT_IE6) in Encrypted Shuffle. Contributed by Wei-Chiu Chuang. (cherry picked from commit 90fcb16c0fc7cded2593948f1cc08f3d1ae88bda) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ae29b1a1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ae29b1a1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ae29b1a1 Branch: refs/heads/branch-2 Commit: ae29b1a17bc3181b760538eda68227a7282b4678 Parents: 07b0abe Author: Junping Du <junping...@apache.org> Authored: Mon Mar 28 05:30:42 2016 -0700 Committer: Junping Du <junping...@apache.org> Committed: Mon Mar 28 05:31:46 2016 -0700 ---------------------------------------------------------------------- .../hadoop-common/src/main/resources/core-default.xml | 2 +- .../src/site/markdown/EncryptedShuffle.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ae29b1a1/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml index 87fe6ae..28e0a8a 100644 --- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml +++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml @@ -1579,7 +1579,7 @@ <value>DEFAULT</value> <description> The hostname verifier to provide for HttpsURLConnections. - Valid values are: DEFAULT, STRICT, STRICT_I6, DEFAULT_AND_LOCALHOST and + Valid values are: DEFAULT, STRICT, STRICT_IE6, DEFAULT_AND_LOCALHOST and ALLOW_ALL </description> </property> http://git-wip-us.apache.org/repos/asf/hadoop/blob/ae29b1a1/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/EncryptedShuffle.md ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/EncryptedShuffle.md b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/EncryptedShuffle.md index 4083182..254d323 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/EncryptedShuffle.md +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/EncryptedShuffle.md @@ -40,7 +40,7 @@ To enable encrypted shuffle, set the following properties in core-site.xml of al | **Property** | **Default Value** | **Explanation** | |:---- |:---- |:---- | | `hadoop.ssl.require.client.cert` | `false` | Whether client certificates are required | -| `hadoop.ssl.hostname.verifier` | `DEFAULT` | The hostname verifier to provide for HttpsURLConnections. Valid values are: **DEFAULT**, **STRICT**, **STRICT\_I6**, **DEFAULT\_AND\_LOCALHOST** and **ALLOW\_ALL** | +| `hadoop.ssl.hostname.verifier` | `DEFAULT` | The hostname verifier to provide for HttpsURLConnections. Valid values are: **DEFAULT**, **STRICT**, **STRICT\_IE6**, **DEFAULT\_AND\_LOCALHOST** and **ALLOW\_ALL** | | `hadoop.ssl.keystores.factory.class` | `org.apache.hadoop.security.ssl.FileBasedKeyStoresFactory` | The KeyStoresFactory implementation to use | | `hadoop.ssl.server.conf` | `ssl-server.xml` | Resource file from which ssl server keystore information will be extracted. This file is looked up in the classpath, typically it should be in Hadoop conf/ directory | | `hadoop.ssl.client.conf` | `ssl-client.xml` | Resource file from which ssl server keystore information will be extracted. This file is looked up in the classpath, typically it should be in Hadoop conf/ directory | @@ -260,4 +260,4 @@ Encrypted Intermediate Data Spill files This capability allows encryption of the intermediate files generated during the merge and shuffle phases. It can be enabled by setting the `mapreduce.job.encrypted-intermediate-data` job property to `true`. -**NOTE:** Currently, enabling encrypted intermediate data spills would restrict the number of attempts of the job to 1. \ No newline at end of file +**NOTE:** Currently, enabling encrypted intermediate data spills would restrict the number of attempts of the job to 1.
