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
This commit is contained in:
Harsh J 2012-01-02 06:34:42 +00:00
parent c0f4668bd4
commit e0c776dda9
2 changed files with 5 additions and 0 deletions

View File

@ -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

View File

@ -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