From e0c776dda99f8ba3cb134c5dfc27cd411f558ce8 Mon Sep 17 00:00:00 2001 From: Harsh J Date: Mon, 2 Jan 2012 06:34:42 +0000 Subject: [PATCH] merge HADOOP-7504 (harsh) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1226352 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../hadoop-common/src/main/conf/hadoop-metrics.properties | 3 +++ 2 files changed, 5 insertions(+) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index e4398145d42..ad2fa726b9b 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -46,6 +46,8 @@ Release 0.23.1 - Unreleased HADOOP-7890. Redirect hadoop script's deprecation message to stderr. (Koji Knoguchi via mahadev) + HADOOP-7504. Add the missing Ganglia31 opts to hadoop-metrics.properties as a comment. (harsh) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics.properties b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics.properties index baa57bc321a..c1b2eb7645a 100644 --- a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics.properties +++ b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics.properties @@ -40,6 +40,7 @@ mapred.class=org.apache.hadoop.metrics.spi.NullContext # Configuration of the "jvm" context for ganglia # jvm.class=org.apache.hadoop.metrics.ganglia.GangliaContext +# jvm.class=org.apache.hadoop.metrics.ganglia.GangliaContext31 # jvm.period=10 # jvm.servers=localhost:8649 @@ -53,6 +54,7 @@ rpc.class=org.apache.hadoop.metrics.spi.NullContext # Configuration of the "rpc" context for ganglia # rpc.class=org.apache.hadoop.metrics.ganglia.GangliaContext +# rpc.class=org.apache.hadoop.metrics.ganglia.GangliaContext31 # rpc.period=10 # rpc.servers=localhost:8649 @@ -67,6 +69,7 @@ ugi.class=org.apache.hadoop.metrics.spi.NullContext # Configuration of the "ugi" context for ganglia # ugi.class=org.apache.hadoop.metrics.ganglia.GangliaContext +# ugi.class=org.apache.hadoop.metrics.ganglia.GangliaContext31 # ugi.period=10 # ugi.servers=localhost:8649