Repository: hadoop
Updated Branches:
refs/heads/branch-2 6090f5172 -> b1e7f9c58
MAPREDUCE-6268. Fix typo in Task Attempt API's URL. Contributed by Ryu
Kobayashi.
(cherry picked from commit 742f9d90c00f823ad7fea7e79702fcf238fa5721)
Conflicts:
hadoop-mapreduce-project/CHANGES.txt
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/site/markdown/HistoryServerRest.md
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b1e7f9c5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b1e7f9c5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b1e7f9c5
Branch: refs/heads/branch-2
Commit: b1e7f9c58862d1044ad8ac6c57f8a055f27e2764
Parents: 6090f51
Author: Tsuyoshi Ozawa <[email protected]>
Authored: Tue Mar 3 16:21:16 2015 +0900
Committer: Tsuyoshi Ozawa <[email protected]>
Committed: Tue Mar 3 16:24:27 2015 +0900
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../src/site/apt/HistoryServerRest.apt.vm | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b1e7f9c5/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt
b/hadoop-mapreduce-project/CHANGES.txt
index c51bd23..47152f9 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -151,6 +151,9 @@ Release 2.7.0 - UNRELEASED
MAPREDUCE-2815. JavaDoc does not generate correctly for
MultithreadedMapRunner. (Chris Palmer via aajisaka)
+ MAPREDUCE-6268. Fix typo in Task Attempt API's URL. (Ryu Kobayashi
+ via ozawa)
+
Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b1e7f9c5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/site/apt/HistoryServerRest.apt.vm
----------------------------------------------------------------------
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/site/apt/HistoryServerRest.apt.vm
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/site/apt/HistoryServerRest.apt.vm
index 5a1e36bf..de352aa 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/site/apt/HistoryServerRest.apt.vm
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/site/apt/HistoryServerRest.apt.vm
@@ -2137,7 +2137,7 @@ MapReduce History Server REST API's.
Use the following URI to obtain an Task Attempt Object, from a task
identified by the {attemptid} value.
------
- * http://<history server http
address:port>/ws/v1/history/mapreduce/jobs/{jobid}/tasks/{taskid}/attempt/{attemptid}
+ * http://<history server http
address:port>/ws/v1/history/mapreduce/jobs/{jobid}/tasks/{taskid}/attempts/{attemptid}
------
*** HTTP Operations Supported
