Repository: hadoop Updated Branches: refs/heads/branch-2 bed74b620 -> 5fbf91b45 refs/heads/trunk bc99aaffe -> 7e2fe8c9f
MAPREDUCE-6038. A boolean may be set error in the Word Count v2.0 in MapReduce Tutorial. Contributed by Tsuyoshi Ozawa (cherry picked from commit 4990ccfdc742be9c0517557a6256fefcae0df67d) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5fbf91b4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5fbf91b4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5fbf91b4 Branch: refs/heads/branch-2 Commit: 5fbf91b453b0c03e1aa6d72c5a9401aee9949796 Parents: bed74b6 Author: Chris Douglas <[email protected]> Authored: Tue Jul 7 10:26:27 2015 -0700 Committer: Chris Douglas <[email protected]> Committed: Tue Jul 7 10:26:57 2015 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/site/markdown/MapReduceTutorial.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5fbf91b4/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 5d32e71..bfd5b75 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -263,6 +263,9 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6418. MRApp should not shutdown LogManager during shutdown (Chang Li via jlowe) + MAPREDUCE-6038. A boolean may be set error in the Word Count v2.0 in + MapReduce Tutorial. (Tsuyoshi Ozawa via cdouglas) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/5fbf91b4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md index 4db06e3..c9c9d53 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md @@ -978,7 +978,7 @@ public class WordCount2 { InterruptedException { conf = context.getConfiguration(); caseSensitive = conf.getBoolean("wordcount.case.sensitive", true); - if (conf.getBoolean("wordcount.skip.patterns", true)) { + if (conf.getBoolean("wordcount.skip.patterns", false)) { URI[] patternsURIs = Job.getInstance(conf).getCacheFiles(); for (URI patternsURI : patternsURIs) { Path patternsPath = new Path(patternsURI.getPath());
