Repository: incubator-falcon Updated Branches: refs/heads/master 089ecf419 -> 36d01791c
FALCON-382 Error While building Latest trunk code with Hadoop 2.2.0. Contributed by Suhas Vasu Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/36d01791 Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/36d01791 Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/36d01791 Branch: refs/heads/master Commit: 36d01791c9df137f6c97f59100038c737e7ee162 Parents: 089ecf4 Author: Suhas V <[email protected]> Authored: Wed May 21 19:09:32 2014 +0530 Committer: Suhas V <[email protected]> Committed: Wed May 21 19:09:32 2014 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/bin/falcon-config.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/36d01791/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b85fecc..1efb4a4 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -13,6 +13,8 @@ Trunk (Unreleased) OPTIMIZATIONS BUG FIXES + FALCON-382 Error While building Latest trunk code with Hadoop 2.2.0. (Suhas Vasu) + FALCON-240 Instance status from CLI on a feed doesn't give the retention details. (pavan kumar kolamuri via Shwetha GS) http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/36d01791/src/bin/falcon-config.sh ---------------------------------------------------------------------- diff --git a/src/bin/falcon-config.sh b/src/bin/falcon-config.sh index 36be053..8591c7c 100644 --- a/src/bin/falcon-config.sh +++ b/src/bin/falcon-config.sh @@ -84,8 +84,8 @@ case $type in echo "Hadoop is installed, adding hadoop classpath to falcon classpath" FALCONCPPATH="${FALCONCPPATH}:`hadoop classpath`" elif [ "$HADOOP_HOME" != "" ]; then - echo "Hadoop home is set, adding ${HADOOP_HOME}/lib/* into falcon classpath" - FALCONCPPATH="${FALCONCPPATH}:${HADOOP_HOME}/lib/*" + echo "Hadoop home is set, adding libraries from '${HADOOP_HOME}/bin/hadoop classpath' into falcon classpath" + FALCONCPPATH="${FALCONCPPATH}:`${HADOOP_HOME}/bin/hadoop classpath`" else echo "Could not find installed hadoop and HADOOP_HOME is not set." echo "Using the default jars bundled in ${BASEDIR}/hadooplibs/"
