Repository: hadoop Updated Branches: refs/heads/branch-2 be7e5837a -> ac218d4da
HDFS-6979. hdfs.dll not produce .pdb files. Contributed by Chris Nauroth. (cherry picked from commit fab9bc58ec03ea81cd5ce8a8746a4ee588f7bb08) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ac218d4d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ac218d4d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ac218d4d Branch: refs/heads/branch-2 Commit: ac218d4dac4884d371642e3ba462863aac58cb60 Parents: be7e583 Author: cnauroth <[email protected]> Authored: Fri Sep 5 11:03:58 2014 -0700 Committer: cnauroth <[email protected]> Committed: Fri Sep 5 11:04:57 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ hadoop-hdfs-project/hadoop-hdfs/pom.xml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ac218d4d/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 6eb6531..6777a5f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -344,6 +344,8 @@ Release 2.6.0 - UNRELEASED HDFS-6831. Inconsistency between 'hdfs dfsadmin' and 'hdfs dfsadmin -help'. (Xiaoyu Yao via Arpit Agarwal) + HDFS-6979. hdfs.dll not produce .pdb files. (cnauroth) + BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS HDFS-6387. HDFS CLI admin tool for creating & deleting an http://git-wip-us.apache.org/repos/asf/hadoop/blob/ac218d4d/hadoop-hdfs-project/hadoop-hdfs/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index d4d61b0..fa4101c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -558,11 +558,11 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> </exec> <exec executable="msbuild" dir="${project.build.directory}/native" failonerror="true"> - <arg line="ALL_BUILD.vcxproj /nologo /p:Configuration=Release"/> + <arg line="ALL_BUILD.vcxproj /nologo /p:Configuration=RelWithDebInfo /p:LinkIncremental=false"/> </exec> <!-- Copy for inclusion in distribution. --> <copy todir="${project.build.directory}/bin"> - <fileset dir="${project.build.directory}/native/target/bin/Release"/> + <fileset dir="${project.build.directory}/native/target/bin/RelWithDebInfo"/> </copy> </target> </configuration> @@ -580,7 +580,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <attribute name="test"/> <sequential> <echo message="Running @{test}"/> - <exec executable="${project.build.directory}/native/Release/@{test}" failonerror="true" dir="${project.build.directory}/native/"> + <exec executable="${project.build.directory}/native/RelWithDebInfo/@{test}" failonerror="true" dir="${project.build.directory}/native/"> <env key="CLASSPATH" value="${test_classpath}:${compile_classpath}"/> <!-- HADOOP_HOME required to find winutils. --> <env key="HADOOP_HOME" value="${hadoop.common.build.dir}"/>
