diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index 2e22020050..c5ba1c3e82 100755 --- a/dev-support/test-patch.sh +++ b/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}'` diff --git a/hadoop-common/CHANGES.HDFS-1623.txt b/hadoop-common/CHANGES.HDFS-1623.txt new file mode 100644 index 0000000000..f207309375 --- /dev/null +++ b/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) diff --git a/hadoop-common/CHANGES.txt b/hadoop-common/CHANGES.txt index 5435ea6814..c499c750f0 100644 --- a/hadoop-common/CHANGES.txt +++ b/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