You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2018/05/22 10:43:00 UTC
[1/2] storm git commit: STORM-3068: STORM_JAR_JVM_OPTS are not passed
to storm-kafka-monitor properly
Repository: storm
Updated Branches:
refs/heads/master e6ad8938e -> 93ed60142
STORM-3068: STORM_JAR_JVM_OPTS are not passed to storm-kafka-monitor properly
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d976f489
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d976f489
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d976f489
Branch: refs/heads/master
Commit: d976f4890ab3f2f81bf2a86b23584b341aacc798
Parents: 5deba40
Author: Rajkumar singh <ra...@gmail.com>
Authored: Thu May 10 12:58:01 2018 -0700
Committer: Rajkumar singh <ra...@gmail.com>
Committed: Thu May 10 12:58:01 2018 -0700
----------------------------------------------------------------------
bin/storm-kafka-monitor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d976f489/bin/storm-kafka-monitor
----------------------------------------------------------------------
diff --git a/bin/storm-kafka-monitor b/bin/storm-kafka-monitor
index 2958e85..7c01d03 100755
--- a/bin/storm-kafka-monitor
+++ b/bin/storm-kafka-monitor
@@ -49,4 +49,4 @@ if [ -z "$JAVA_HOME" ]; then
else
JAVA="$JAVA_HOME/bin/java"
fi
-exec $JAVA $STORM_JAAS_CONF_PARAM -cp $STORM_BASE_DIR/lib-tools/storm-kafka-monitor/storm-kafka-monitor-*.jar org.apache.storm.kafka.monitor.KafkaOffsetLagUtil "$@"
\ No newline at end of file
+exec $JAVA $STORM_JAAS_CONF_PARAM $STORM_JAR_JVM_OPTS -cp $STORM_BASE_DIR/lib-tools/storm-kafka-monitor/storm-kafka-monitor-*.jar org.apache.storm.kafka.monitor.KafkaOffsetLagUtil "$@"
[2/2] storm git commit: Merge branch 'STORM-3068' of
https://github.com/rajkrrsingh/storm into STORM-3068-merge
Posted by ka...@apache.org.
Merge branch 'STORM-3068' of https://github.com/rajkrrsingh/storm into STORM-3068-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/93ed6014
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/93ed6014
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/93ed6014
Branch: refs/heads/master
Commit: 93ed601425a79759c0189a945c6b46266e5c9ced
Parents: e6ad893 d976f48
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue May 22 19:42:18 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue May 22 19:42:18 2018 +0900
----------------------------------------------------------------------
bin/storm-kafka-monitor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------