Pārlūkot izejas kodu

HADOOP-9730. Fix hadoop.spec to add task-log4j.properties. Contributed by Giridharan Kesavan.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.2@1503152 13f79535-47bb-0310-9956-ffa450edef68
Matthew Foley 12 gadi atpakaļ
vecāks
revīzija
50e0b5917c
3 mainītis faili ar 11 papildinājumiem un 1 dzēšanām
  1. 4 1
      CHANGES.txt
  2. 5 0
      src/docs/releasenotes.html
  3. 2 0
      src/packages/rpm/spec/hadoop.spec

+ 4 - 1
CHANGES.txt

@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 1.2.1 - 2013.07.14
+Release 1.2.1 - 2013.07.15
 
   INCOMPATIBLE CHANGES
 
@@ -62,6 +62,9 @@ Release 1.2.1 - 2013.07.14
     values for hash-tables to store Locality and Avataar for TaskAttempts.
     (zhaoyunjiong via acmurthy)
 
+    HADOOP-9730. Fix hadoop.spec to add task-log4j.properties. (Giridharan Kesavan
+    via mattf)
+
 Release 1.2.0 - 2013.05.05
 
   INCOMPATIBLE CHANGES

+ 5 - 0
src/docs/releasenotes.html

@@ -44,6 +44,11 @@
      <b>BlockDecompressorStream#decompress will throw EOFException instead of return -1 when EOF</b><br>
      <blockquote>BlockDecompressorStream#decompress ultimately calls rawReadInt, which will throw EOFException instead of return -1 when encountering end of a stream. Then, decompress will be called by read. However, InputStream#read is supposed to return -1 instead of throwing EOFException to indicate the end of a stream. This explains why in LineReader,<br>{code}<br>      if (bufferPosn &gt;= bufferLength) {<br>        startPosn = bufferPosn = 0;<br>        if (prevCharCR)<br>          ++bytesConsumed; //account for CR from ...</blockquote></li>
 
+<li> <a href="https://issues.apache.org/jira/browse/HADOOP-9730">HADOOP-9730</a>.
+     Major bug reported by gkesavan and fixed by gkesavan (build)<br>
+     <b>fix hadoop.spec to add task-log4j.properties </b><br>
+     <blockquote></blockquote></li>
+
 <li> <a href="https://issues.apache.org/jira/browse/HDFS-4261">HDFS-4261</a>.
      Major bug reported by szetszwo and fixed by djp (balancer)<br>
      <b>TestBalancerWithNodeGroup times out</b><br>

+ 2 - 0
src/packages/rpm/spec/hadoop.spec

@@ -186,6 +186,7 @@ bash ${RPM_INSTALL_PREFIX0}/sbin/update-hadoop-env.sh \
 %config(noreplace) %{_conf_dir}/hadoop-policy.xml
 %config(noreplace) %{_conf_dir}/hdfs-site.xml
 %config(noreplace) %{_conf_dir}/log4j.properties
+%config(noreplace) %{_conf_dir}/task-log4j.properties
 %config(noreplace) %{_conf_dir}/mapred-queue-acls.xml
 %config(noreplace) %{_conf_dir}/mapred-site.xml
 %config(noreplace) %{_conf_dir}/masters
@@ -194,6 +195,7 @@ bash ${RPM_INSTALL_PREFIX0}/sbin/update-hadoop-env.sh \
 %config(noreplace) %{_conf_dir}/ssl-server.xml.example
 %config(noreplace) %{_conf_dir}/taskcontroller.cfg
 %config(noreplace) %{_conf_dir}/fair-scheduler.xml
+
 %{_prefix}
 %attr(0755,root,root) %{_prefix}/libexec
 %attr(0755,root,root) /etc/rc.d/init.d