You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2016/01/28 23:47:12 UTC
[3/3] hadoop git commit: MAPREDUCE-6563. Streaming documentation
contains a stray % character. Contributed by Chris Nauroth.
MAPREDUCE-6563. Streaming documentation contains a stray % character. Contributed by Chris Nauroth.
(cherry picked from commit 41da9a07738c6d019e2467f139750b7e2f50a914)
Conflicts:
hadoop-mapreduce-project/CHANGES.txt
(cherry picked from commit bd01fdb64d17b6146fc3588040aba9ed53ca57f9)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ced22ca7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ced22ca7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ced22ca7
Branch: refs/heads/branch-2.8
Commit: ced22ca78f6aa4c6146e6975034ef04cf3da0beb
Parents: 353518f
Author: cnauroth <cn...@apache.org>
Authored: Thu Jan 28 14:26:52 2016 -0800
Committer: cnauroth <cn...@apache.org>
Committed: Thu Jan 28 14:47:03 2016 -0800
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ced22ca7/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 539f7a3..b55f3f1 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -403,6 +403,9 @@ Release 2.8.0 - UNRELEASED
MAPREDUCE-6619. HADOOP_CLASSPATH is overwritten in MR container.
(Junping Du via jianhe)
+ MAPREDUCE-6563. Streaming documentation contains a stray '%' character.
+ (cnauroth)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ced22ca7/hadoop-tools/hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm b/hadoop-tools/hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm
index 919dd31..e175a5f 100644
--- a/hadoop-tools/hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm
+++ b/hadoop-tools/hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm
@@ -1,4 +1,4 @@
-%<!---
+<!---
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at