Updated Branches: refs/heads/flume-1.4 41a621f39 -> 0d7ab0a7d
FLUME-1656. flume-ng script disregards stderr from hadoop command when finding hadoop jars. (Brock Noland via Hari Shreedharan) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/0d7ab0a7 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/0d7ab0a7 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/0d7ab0a7 Branch: refs/heads/flume-1.4 Commit: 0d7ab0a7d5a35aeb68879ab3c582ab92a00829b7 Parents: 41a621f Author: Hari Shreedharan <[email protected]> Authored: Fri Nov 9 11:23:31 2012 -0800 Committer: Hari Shreedharan <[email protected]> Committed: Fri Nov 9 11:24:28 2012 -0800 ---------------------------------------------------------------------- bin/flume-ng | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/0d7ab0a7/bin/flume-ng ---------------------------------------------------------------------- diff --git a/bin/flume-ng b/bin/flume-ng index 37b446b..62e9bba 100755 --- a/bin/flume-ng +++ b/bin/flume-ng @@ -71,7 +71,7 @@ add_hadoop_paths() { local HADOOP_CLASSPATH="" local HADOOP_JAVA_LIBRARY_PATH=$(HADOOP_CLASSPATH="$FLUME_CLASSPATH" \ ${HADOOP_IN_PATH} org.apache.flume.tools.GetJavaProperty \ - java.library.path 2>/dev/null) + java.library.path) # look for the line that has the desired property value # (considering extraneous output from some GC options that write to stdout) @@ -90,7 +90,7 @@ add_hadoop_paths() { fi # determine hadoop classpath - HADOOP_CLASSPATH=$($HADOOP_IN_PATH classpath 2>/dev/null) + HADOOP_CLASSPATH=$($HADOOP_IN_PATH classpath) # hack up and filter hadoop classpath local ELEMENTS=$(sed -e 's/:/ /g' <<<${HADOOP_CLASSPATH}) @@ -120,7 +120,7 @@ add_HBASE_paths() { local HBASE_CLASSPATH="" local HBASE_JAVA_LIBRARY_PATH=$(HBASE_CLASSPATH="$FLUME_CLASSPATH" \ ${HBASE_IN_PATH} org.apache.flume.tools.GetJavaProperty \ - java.library.path 2>/dev/null) + java.library.path) # look for the line that has the desired property value # (considering extraneous output from some GC options that write to stdout) @@ -139,7 +139,7 @@ add_HBASE_paths() { fi # determine HBASE classpath - HBASE_CLASSPATH=$($HBASE_IN_PATH classpath 2>/dev/null) + HBASE_CLASSPATH=$($HBASE_IN_PATH classpath) # hack up and filter HBASE classpath local ELEMENTS=$(sed -e 's/:/ /g' <<<${HBASE_CLASSPATH})
