فهرست منبع

Create CHANGES.HDFS-1623.txt for HDFS-1623 branch changes and move one change from CHANGES.txt into it.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1154410 13f79535-47bb-0310-9956-ffa450edef68
Suresh Srinivas 14 سال پیش
والد
کامیت
f0ecbd0043
3فایلهای تغییر یافته به همراه9 افزوده شده و 4 حذف شده
  1. 2 2
      dev-support/test-patch.sh
  2. 7 0
      hadoop-common/CHANGES.HDFS-1623.txt
  3. 0 2
      hadoop-common/CHANGES.txt

+ 2 - 2
dev-support/test-patch.sh

@@ -298,8 +298,8 @@ checkJavadocWarnings () {
   echo ""
   echo ""
   echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= clean javadoc | tee $PATCH_DIR/patchJavadocWarnings.txt"
-  (cd root; mvn install)
-  (cd doclet; mvn install)
+  (cd root; mvn install -DskipTests)
+  (cd doclet; mvn install -DskipTests)
   #$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= clean javadoc | tee $PATCH_DIR/patchJavadocWarnings.txt
   $MAVEN_HOME/bin/mvn clean compile javadoc:javadoc -DskipTests -Pdocs -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/patchJavadocWarnings.txt 2>&1
   javadocWarnings=`$GREP '\[WARNING\]' $PATCH_DIR/patchJavadocWarnings.txt | awk '/Javadoc Warnings/,EOF' | $GREP -v 'Javadoc Warnings' | awk 'BEGIN {total = 0} {total += 1} END {print total}'`

+ 7 - 0
hadoop-common/CHANGES.HDFS-1623.txt

@@ -0,0 +1,7 @@
+Changes for HDFS-1623 branch.
+
+This change list will be merged into the trunk CHANGES.txt when the HDFS-1623
+branch is merged.
+------------------------------
+
+HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh)

+ 0 - 2
hadoop-common/CHANGES.txt

@@ -63,8 +63,6 @@ Trunk (unreleased changes)
     HADOOP-6385. dfs should support -rmdir (was HDFS-639). (Daryn Sharp
     via mattf)
 
-    HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh)
-
   IMPROVEMENTS
 
     HADOOP-7042. Updates to test-patch.sh to include failed test names and