You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wa...@apache.org on 2015/05/29 23:59:27 UTC
hadoop git commit: HADOOP-11885. hadoop-dist dist-layout-stitching.sh
does not work with dash. (wang)
Repository: hadoop
Updated Branches:
refs/heads/trunk 7817674a3 -> 7673d4f20
HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash. (wang)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7673d4f2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7673d4f2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7673d4f2
Branch: refs/heads/trunk
Commit: 7673d4f205b26a6a26cfc47d999ece96f3c42782
Parents: 7817674
Author: Andrew Wang <an...@cloudera.com>
Authored: Fri May 29 14:54:18 2015 -0700
Committer: Andrew Wang <an...@cloudera.com>
Committed: Fri May 29 14:54:18 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
hadoop-common-project/hadoop-common/pom.xml | 2 +-
hadoop-common-project/hadoop-kms/pom.xml | 4 ++--
hadoop-dist/pom.xml | 4 ++--
hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 4 ++--
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 2 +-
.../hadoop-mapreduce-client-nativetask/pom.xml | 2 +-
hadoop-mapreduce-project/pom.xml | 4 ++--
hadoop-project-dist/pom.xml | 4 ++--
.../hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml | 2 +-
hadoop-yarn-project/pom.xml | 2 +-
pom.xml | 2 ++
12 files changed, 20 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7673d4f2/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index bc74696..e5d2e39 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -643,6 +643,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-11242. Record the time of calling in tracing span of
IPC server. (Masatake Iwasaki via aajisaka)
+ HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash.
+ (wang)
+
BUG FIXES
HADOOP-11802: DomainSocketWatcher thread terminates sometimes after there
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7673d4f2/hadoop-common-project/hadoop-common/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 3043889..c3a306b 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -666,7 +666,7 @@
<goals><goal>run</goal></goals>
<configuration>
<target>
- <exec executable="sh" failonerror="true" dir="${project.build.directory}/native">
+ <exec executable="${shell-executable}" failonerror="true" dir="${project.build.directory}/native">
<arg value="-c"/>
<arg value="[ x$SKIPTESTS = xtrue ] || ${project.build.directory}/native/test_bulk_crc32"/>
<env key="SKIPTESTS" value="${skipTests}"/>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7673d4f2/hadoop-common-project/hadoop-kms/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-kms/pom.xml b/hadoop-common-project/hadoop-kms/pom.xml
index c33b33e..ad2062b 100644
--- a/hadoop-common-project/hadoop-kms/pom.xml
+++ b/hadoop-common-project/hadoop-kms/pom.xml
@@ -383,7 +383,7 @@
cd "${project.build.directory}/tomcat.exp"
gzip -cd ../../downloads/apache-tomcat-${tomcat.version}.tar.gz | tar xf -
</echo>
- <exec executable="sh" dir="${project.build.directory}"
+ <exec executable="${shell-executable}" dir="${project.build.directory}"
failonerror="true">
<arg line="./tomcat-untar.sh"/>
</exec>
@@ -426,7 +426,7 @@
cd "${project.build.directory}"
tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz
</echo>
- <exec executable="sh" dir="${project.build.directory}"
+ <exec executable="${shell-executable}" dir="${project.build.directory}"
failonerror="true">
<arg line="./dist-maketar.sh"/>
</exec>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7673d4f2/hadoop-dist/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
index f894c01..f1644a8 100644
--- a/hadoop-dist/pom.xml
+++ b/hadoop-dist/pom.xml
@@ -191,7 +191,7 @@
echo "Hadoop dist layout available at: ${project.build.directory}/hadoop-${project.version}"
echo
</echo>
- <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+ <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-layout-stitching.sh"/>
</exec>
</target>
@@ -224,7 +224,7 @@
echo "Hadoop dist tar available at: ${project.build.directory}/hadoop-${project.version}.tar.gz"
echo
</echo>
- <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+ <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-tar-stitching.sh"/>
</exec>
</target>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7673d4f2/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
index 520e30f..4457597 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -517,7 +517,7 @@
cd "${project.build.directory}/tomcat.exp"
gzip -cd ../../downloads/apache-tomcat-${tomcat.version}.tar.gz | tar xf -
</echo>
- <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+ <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./tomcat-untar.sh"/>
</exec>
@@ -557,7 +557,7 @@
cd "${project.build.directory}"
tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz
</echo>
- <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+ <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-maketar.sh"/>
</exec>
</target>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7673d4f2/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 3eeadb6..f90644c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -674,7 +674,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<phase>test-compile</phase>
<configuration>
<target>
- <exec executable="sh">
+ <exec executable="${shell-executable}">
<arg value="-c"/>
<arg value="for i in {1..${testsThreadCount}}; do mkdir -p ${test.build.data}/$i; mkdir -p ${hadoop.tmp.dir}/$i; done"/>
</exec>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7673d4f2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml
index 3b0ee48..a5532f1 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml
@@ -197,7 +197,7 @@
<goals><goal>run</goal></goals>
<configuration>
<target>
- <exec executable="sh" failonerror="true" dir="${project.build.directory}/native/test">
+ <exec executable="${shell-executable}" failonerror="true" dir="${project.build.directory}/native/test">
<arg value="-c"/>
<arg value="[ x$SKIPTESTS = xtrue ] || sh test.sh"/>
<env key="SKIPTESTS" value="${skipTests}"/>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7673d4f2/hadoop-mapreduce-project/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml
index 088a3ba..0cbd928 100644
--- a/hadoop-mapreduce-project/pom.xml
+++ b/hadoop-mapreduce-project/pom.xml
@@ -170,7 +170,7 @@
cd "${project.build.directory}"
tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz
</echo>
- <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+ <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-maketar.sh"/>
</exec>
</target>
@@ -254,7 +254,7 @@
cp -R $${LIB_DIR}/lib* $${TARGET_DIR}
fi
</echo>
- <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+ <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-copynativelibs.sh"/>
</exec>
</target>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7673d4f2/hadoop-project-dist/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-project-dist/pom.xml b/hadoop-project-dist/pom.xml
index e712910..8df266f 100644
--- a/hadoop-project-dist/pom.xml
+++ b/hadoop-project-dist/pom.xml
@@ -361,7 +361,7 @@
fi
fi
</echo>
- <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+ <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-copynativelibs.sh"/>
</exec>
</target>
@@ -380,7 +380,7 @@
cd "${project.build.directory}"
tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz
</echo>
- <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+ <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-maketar.sh"/>
</exec>
</target>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7673d4f2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
index 8e135de..babed8e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
@@ -203,7 +203,7 @@
<phase>test</phase>
<configuration>
<target>
- <exec executable="sh" failonerror="true" dir="${project.build.directory}/native">
+ <exec executable="${shell-executable}" failonerror="true" dir="${project.build.directory}/native">
<arg value="-c"/>
<arg value="[ x$SKIPTESTS = xtrue ] || test-container-executor"/>
<env key="SKIPTESTS" value="${skipTests}"/>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7673d4f2/hadoop-yarn-project/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml
index 736508b..e21e0b8 100644
--- a/hadoop-yarn-project/pom.xml
+++ b/hadoop-yarn-project/pom.xml
@@ -96,7 +96,7 @@
cd "${project.build.directory}"
tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz
</echo>
- <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+ <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-maketar.sh"/>
</exec>
</target>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7673d4f2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8394324f..4e6f7a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,6 +105,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
<maven-checkstyle-plugin.version>2.15</maven-checkstyle-plugin.version>
<checkstyle.version>6.6</checkstyle.version>
+
+ <shell-executable>bash</shell-executable>
</properties>
<modules>