Repository: hadoop Updated Branches: refs/heads/branch-2 b4446cb37 -> f6102831b
HADOOP-11186: documentation should talk about hadoop.htrace.spanreceiver.classes, not hadoop.trace.spanreceiver.classes (cmccabe) (cherry picked from commit c2575fb046bb8fab73ee9c55e0ce65d4d0df75d0) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f6102831 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f6102831 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f6102831 Branch: refs/heads/branch-2 Commit: f6102831bca0a8401aa88b7324be3e766ab9509b Parents: b4446cb Author: Colin Patrick Mccabe <[email protected]> Authored: Wed Oct 29 12:12:58 2014 -0700 Committer: Colin Patrick Mccabe <[email protected]> Committed: Wed Oct 29 12:14:30 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-common-project/hadoop-common/src/site/apt/Tracing.apt.vm | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f6102831/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 3ba1b31..acc8d66 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -30,6 +30,9 @@ Release 2.7.0 - UNRELEASED HDFS-7227. Fix findbugs warning about NP_DEREFERENCE_OF_READLINE_VALUE in SpanReceiverHost (cmccabe) + HADOOP-11186. documentation should talk about + hadoop.htrace.spanreceiver.classes, not hadoop.trace.spanreceiver.classes (cmccabe) + Release 2.6.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/f6102831/hadoop-common-project/hadoop-common/src/site/apt/Tracing.apt.vm ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/site/apt/Tracing.apt.vm b/hadoop-common-project/hadoop-common/src/site/apt/Tracing.apt.vm index 31c2516..9eda220 100644 --- a/hadoop-common-project/hadoop-common/src/site/apt/Tracing.apt.vm +++ b/hadoop-common-project/hadoop-common/src/site/apt/Tracing.apt.vm @@ -42,7 +42,7 @@ public void receiveSpan(Span span); Configure what SpanReceivers you'd like to use by putting a comma separated list of the fully-qualified class name of classes implementing SpanReceiver - in <<<hdfs-site.xml>>> property: <<<hadoop.trace.spanreceiver.classes>>>. + in <<<hdfs-site.xml>>> property: <<<hadoop.htrace.spanreceiver.classes>>>. +---- <property>
