Repository: flume Updated Branches: refs/heads/flume-1.5 042f53a5f -> 636031253
FLUME-2347: Add FLUME_JAVA_OPTS which allows users to inject java properties from cmd line (Brock Noland via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/63603125 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/63603125 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/63603125 Branch: refs/heads/flume-1.5 Commit: 636031253a42e8bb5822cb2b52598e21fe4a40a9 Parents: 042f53a Author: Jarek Jarcec Cecho <[email protected]> Authored: Mon Mar 24 12:55:35 2014 -0700 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Mon Mar 24 12:56:43 2014 -0700 ---------------------------------------------------------------------- bin/flume-ng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/63603125/bin/flume-ng ---------------------------------------------------------------------- diff --git a/bin/flume-ng b/bin/flume-ng index 3a8a10d..e09e26b 100755 --- a/bin/flume-ng +++ b/bin/flume-ng @@ -224,7 +224,7 @@ run_flume() { if [ ${CLEAN_FLAG} -ne 0 ]; then set -x fi - $EXEC $JAVA_HOME/bin/java $JAVA_OPTS "${arr_java_props[@]}" -cp "$FLUME_CLASSPATH" \ + $EXEC $JAVA_HOME/bin/java $JAVA_OPTS $FLUME_JAVA_OPTS "${arr_java_props[@]}" -cp "$FLUME_CLASSPATH" \ -Djava.library.path=$FLUME_JAVA_LIBRARY_PATH "$FLUME_APPLICATION_CLASS" $* }
