Browse Source

Merge 763501:763502 from trunk to fix HADOOPO-5645. After HADOOP-4920 we need a place to checkin releasenotes.html.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.20@763504 13f79535-47bb-0310-9956-ffa450edef68
Nigel Daley 16 years ago
parent
commit
b1ab5b2a8c
3 changed files with 5 additions and 0 deletions
  1. 3 0
      CHANGES.txt
  2. 1 0
      build.xml
  3. 1 0
      src/docs/releasenotes.html

+ 3 - 0
CHANGES.txt

@@ -866,6 +866,9 @@ Release 0.20.0 - Unreleased
     HADOOP-5394. JobTracker might schedule 2 attempts of the same task 
     with the same attempt id across restarts. (Amar Kamat via sharad)
 
+    HADOOP-5645. After HADOOP-4920 we need a place to checkin
+    releasenotes.html. (nigel)
+
 Release 0.19.2 - Unreleased
 
   BUG FIXES

+ 1 - 0
build.xml

@@ -853,6 +853,7 @@
     <copy todir="${build.docs}">
       <fileset dir="${docs.src}/build/site/" />
     </copy>
+    <copy file="${docs.src}/releasenotes.html" todir="${build.docs}"/>
     <style basedir="${core.src.dir}" destdir="${build.docs}"
            includes="core-default.xml" style="conf/configuration.xsl"/>
     <style basedir="${hdfs.src.dir}" destdir="${build.docs}"

+ 1 - 0
src/docs/releasenotes.html

@@ -0,0 +1 @@
+THIS IS A PLACEHOLDER.  REAL RELEASE NOTES WILL BE ADDED TO THIS FILE IN RELEASE BRANCHES.