From b13c6bda431c56d88bc5f307abeee69a5e433ee0 Mon Sep 17 00:00:00 2001 From: Chris Nauroth Date: Sat, 9 Nov 2013 07:38:16 +0000 Subject: [PATCH] HADOOP-10088. Merging change r1540270 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540271 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-project-dist/pom.xml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 27b26b096eb..a4f4ff705bb 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -129,6 +129,9 @@ Release 2.3.0 - UNRELEASED HADOOP-9016. HarFsInputStream.skip(long) must never return negative value. (Ivan A. Veselovsky via jeagles) + HADOOP-10088. copy-nativedistlibs.sh needs to quote snappy lib dir. + (Raja Aluri via cnauroth) + Release 2.2.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-project-dist/pom.xml b/hadoop-project-dist/pom.xml index ee798820c01..591c9994646 100644 --- a/hadoop-project-dist/pom.xml +++ b/hadoop-project-dist/pom.xml @@ -346,7 +346,7 @@ cd $${LIB_DIR} $$TAR lib* | (cd $${TARGET_DIR}/; $$UNTAR) if [ "${bundle.snappy}" = "true" ] ; then - cd ${snappy.lib} + cd "${snappy.lib}" $$TAR *snappy* | (cd $${TARGET_DIR}/; $$UNTAR) fi fi @@ -358,7 +358,7 @@ $$TAR * | (cd $${TARGET_BIN_DIR}/; $$UNTAR) if [ "${bundle.snappy.in.bin}" = "true" ] ; then if [ "${bundle.snappy}" = "true" ] ; then - cd ${snappy.lib} + cd "${snappy.lib}" $$TAR *snappy* | (cd $${TARGET_BIN_DIR}/; $$UNTAR) fi fi