Repository: hadoop Updated Branches: refs/heads/branch-2 ab7dab55e -> 3b36f3657
HADOOP-10387. Misspelling of threshold in log4j.properties for tests in hadoop-common-project. Contributed by Brahma Reddy Battula. (cherry picked from commit 305e4733d639830cb1801efaa2dba8e84b86cc29) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3b36f365 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3b36f365 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3b36f365 Branch: refs/heads/branch-2 Commit: 3b36f36576076ad5a4613db44d5f7a020d97cedd Parents: ab7dab5 Author: Akira Ajisaka <[email protected]> Authored: Thu May 7 16:53:57 2015 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Thu May 7 16:54:30 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/test/resources/log4j.properties | 2 +- .../hadoop-nfs/src/test/resources/log4j.properties | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3b36f365/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 4895c15..5b6c7b3 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -165,6 +165,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11912. Extra configuration key used in TraceUtils should respect prefix (Masatake Iwasaki via Colin P. McCabe) + HADOOP-10387. Misspelling of threshold in log4j.properties for tests in + hadoop-common-project. (Brahma Reddy Battula via aajisaka) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/3b36f365/hadoop-common-project/hadoop-common/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/resources/log4j.properties b/hadoop-common-project/hadoop-common/src/test/resources/log4j.properties index 1a6baae..ced0687 100644 --- a/hadoop-common-project/hadoop-common/src/test/resources/log4j.properties +++ b/hadoop-common-project/hadoop-common/src/test/resources/log4j.properties @@ -12,7 +12,7 @@ # log4j configuration used during build and unit tests log4j.rootLogger=info,stdout -log4j.threshhold=ALL +log4j.threshold=ALL log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n http://git-wip-us.apache.org/repos/asf/hadoop/blob/3b36f365/hadoop-common-project/hadoop-nfs/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-nfs/src/test/resources/log4j.properties b/hadoop-common-project/hadoop-nfs/src/test/resources/log4j.properties index 1a6baae..ced0687 100644 --- a/hadoop-common-project/hadoop-nfs/src/test/resources/log4j.properties +++ b/hadoop-common-project/hadoop-nfs/src/test/resources/log4j.properties @@ -12,7 +12,7 @@ # log4j configuration used during build and unit tests log4j.rootLogger=info,stdout -log4j.threshhold=ALL +log4j.threshold=ALL log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
