Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F28CE175A8 for ; Wed, 18 Mar 2015 12:20:34 +0000 (UTC) Received: (qmail 2865 invoked by uid 500); 18 Mar 2015 12:20:28 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 2794 invoked by uid 500); 18 Mar 2015 12:20:28 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 2785 invoked by uid 99); 18 Mar 2015 12:20:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Mar 2015 12:20:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5A0C2E1873; Wed, 18 Mar 2015 12:20:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: harsh@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: MAPREDUCE-5556. mapred docs have incorrect classpath. Contributed by harsh. Date: Wed, 18 Mar 2015 12:20:28 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-1 2943ee5e3 -> 927f13b6c MAPREDUCE-5556. mapred docs have incorrect classpath. Contributed by harsh. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/927f13b6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/927f13b6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/927f13b6 Branch: refs/heads/branch-1 Commit: 927f13b6cb0c5e500d59aa68d952fb6e845b7c37 Parents: 2943ee5 Author: Harsh J Authored: Wed Mar 18 17:49:02 2015 +0530 Committer: Harsh J Committed: Wed Mar 18 17:49:02 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/docs/src/documentation/content/xdocs/mapred_tutorial.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/927f13b6/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 33dccad..e6bfac1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -66,6 +66,8 @@ Release 1.3.0 - unreleased BUG FIXES + MAPREDUCE-5556. mapred docs have incorrect classpath (harsh) + MAPREDUCE-5272. Minor error in javadoc of TestMRWithDistributedCache (Zhijie Shen via harsh) http://git-wip-us.apache.org/repos/asf/hadoop/blob/927f13b6/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml ---------------------------------------------------------------------- diff --git a/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml b/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml index 2f6e5c6..8f3efe1 100644 --- a/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml +++ b/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml @@ -550,7 +550,7 @@

$ mkdir wordcount_classes
- $ javac -classpath ${HADOOP_HOME}/hadoop-${HADOOP_VERSION}-core.jar + $ javac -classpath ${HADOOP_HOME}/hadoop-core-${HADOOP_VERSION}.jar -d wordcount_classes WordCount.java
$ jar -cvf /usr/joe/wordcount.jar -C wordcount_classes/ .