Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -r 1203485:1203486 from trunk to branch-0.23. Fixes: HDFS-2543 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1203487 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2011-11-18 05:11:46 +00:00
parent 90158a3ec2
commit 9a4a187060
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -12,6 +12,8 @@ Release 0.23.1 - UNRELEASED
HDFS-2544. Hadoop scripts unconditionally source HDFS-2544. Hadoop scripts unconditionally source
"$bin"/../libexec/hadoop-config.sh. (Bruno Mahé via tomwhite) "$bin"/../libexec/hadoop-config.sh. (Bruno Mahé via tomwhite)
HDFS-2543. HADOOP_PREFIX cannot be overridden. (Bruno Mahé via tomwhite)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-2130. Switch default checksum to CRC32C. (todd) HDFS-2130. Switch default checksum to CRC32C. (todd)

4
hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/src/fuse_dfs_wrapper.sh
View File

@ -16,9 +16,7 @@
# limitations under the License. # limitations under the License.
# #
if [ "$HADOOP_PREFIX" = "" ]; then export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr/local/share/hadoop}
export HADOOP_PREFIX=/usr/local/share/hadoop
fi
if [ "$OS_ARCH" = "" ]; then if [ "$OS_ARCH" = "" ]; then
export OS_ARCH=amd64 export OS_ARCH=amd64

2
hadoop-hdfs-project/hadoop-hdfs/src/main/packages/deb/init.d/hadoop-secondarynamenode
View File

@ -67,7 +67,7 @@ check_privsep_dir() {
} }
export PATH="${PATH:+$PATH:}/usr/sbin:/usr/bin" export PATH="${PATH:+$PATH:}/usr/sbin:/usr/bin"
export HADOOP_PREFIX="/usr" export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
case "$1" in case "$1" in
start) start)

2
hadoop-hdfs-project/hadoop-hdfs/src/main/packages/rpm/init.d/hadoop-secondarynamenode
View File

@ -27,7 +27,7 @@ source /etc/default/hadoop-env.sh
RETVAL=0 RETVAL=0
PIDFILE="${HADOOP_PID_DIR}/hadoop-hdfs-secondarynamenode.pid" PIDFILE="${HADOOP_PID_DIR}/hadoop-hdfs-secondarynamenode.pid"
desc="Hadoop secondary namenode daemon" desc="Hadoop secondary namenode daemon"
export HADOOP_PREFIX="/usr" export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
start() { start() {
echo -n $"Starting $desc (hadoop-secondarynamenode): " echo -n $"Starting $desc (hadoop-secondarynamenode): "