From b578f76bed535e4233f8694f87a7fb966a4a18e7 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Thu, 21 May 2015 17:52:03 +0900 Subject: [PATCH] HADOOP-10366. Add whitespaces between classes for values in core-default.xml to fit better in browser. Contributed by kanaka kumar avvaru. (cherry picked from commit 0e4f1081c7a98e1c0c4f922f5e2afe467a0d763f) --- hadoop-common-project/hadoop-common/CHANGES.txt | 4 ++++ .../hadoop-common/src/main/resources/core-default.xml | 4 ++-- .../hadoop-hdfs/src/site/markdown/TransparentEncryption.md | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 48719d0ccf5..e58e9cb478c 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -125,6 +125,10 @@ Release 2.8.0 - UNRELEASED HADOOP-11995. Make jetty version configurable from the maven command line. (Sriharsha Devineni via wheat9) + HADOOP-10366. Add whitespaces between classes for values in + core-default.xml to fit better in browser. + (kanaka kumar avvaru via aajisaka) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp 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 4909a52591b..967c51c658f 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 @@ -467,7 +467,7 @@ for ldap providers in the same way as above does. io.serializations - org.apache.hadoop.io.serializer.WritableSerialization,org.apache.hadoop.io.serializer.avro.AvroSpecificSerialization,org.apache.hadoop.io.serializer.avro.AvroReflectSerialization + org.apache.hadoop.io.serializer.WritableSerialization, org.apache.hadoop.io.serializer.avro.AvroSpecificSerialization, org.apache.hadoop.io.serializer.avro.AvroReflectSerialization A list of serialization classes that can be used for obtaining serializers and deserializers. @@ -1657,7 +1657,7 @@ for ldap providers in the same way as above does. hadoop.security.crypto.codec.classes.aes.ctr.nopadding - org.apache.hadoop.crypto.OpensslAesCtrCryptoCodec,org.apache.hadoop.crypto.JceAesCtrCryptoCodec + org.apache.hadoop.crypto.OpensslAesCtrCryptoCodec, org.apache.hadoop.crypto.JceAesCtrCryptoCodec Comma-separated list of crypto codec implementations for AES/CTR/NoPadding. The first implementation will be used if available, others are fallbacks. diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/TransparentEncryption.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/TransparentEncryption.md index aa2acbd3ed2..05e42492909 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/TransparentEncryption.md +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/TransparentEncryption.md @@ -126,7 +126,7 @@ The prefix for a given crypto codec, contains a comma-separated list of implemen #### hadoop.security.crypto.codec.classes.aes.ctr.nopadding -Default: `org.apache.hadoop.crypto.OpensslAesCtrCryptoCodec,org.apache.hadoop.crypto.JceAesCtrCryptoCodec` +Default: `org.apache.hadoop.crypto.OpensslAesCtrCryptoCodec, org.apache.hadoop.crypto.JceAesCtrCryptoCodec` Comma-separated list of crypto codec implementations for AES/CTR/NoPadding. The first implementation will be used if available, others are fallbacks.