kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ewe...@apache.org
Subject kafka git commit: KAFKA-3934: Start scripts enable GC by default with no way to disable
Date Tue, 09 Aug 2016 16:15:23 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk cb7af0b7f -> 157227458


KAFKA-3934: Start scripts enable GC by default with no way to disable

…o disable

Author: Grant Henke <granthenke@gmail.com>

Reviewers: Ewen Cheslack-Postava <ewen@confluent.io>

Closes #1631 from granthenke/garbage-flag


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/15722745
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/15722745
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/15722745

Branch: refs/heads/trunk
Commit: 15722745831b6373817ca156b6d18b8dc1ee9de1
Parents: cb7af0b
Author: Grant Henke <granthenke@gmail.com>
Authored: Tue Aug 9 09:16:17 2016 -0700
Committer: Ewen Cheslack-Postava <me@ewencp.org>
Committed: Tue Aug 9 09:16:17 2016 -0700

----------------------------------------------------------------------
 bin/kafka-server-start.sh     | 6 +++---
 bin/zookeeper-server-start.sh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/15722745/bin/kafka-server-start.sh
----------------------------------------------------------------------
diff --git a/bin/kafka-server-start.sh b/bin/kafka-server-start.sh
index 36c2a0d..5a53126 100755
--- a/bin/kafka-server-start.sh
+++ b/bin/kafka-server-start.sh
@@ -5,9 +5,9 @@
 # The ASF licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
 # the License.  You may obtain a copy of the License at
-# 
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@ if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then
     export KAFKA_HEAP_OPTS="-Xmx1G -Xms1G"
 fi
 
-EXTRA_ARGS="-name kafkaServer -loggc"
+EXTRA_ARGS=${EXTRA_ARGS-'-name kafkaServer -loggc'}
 
 COMMAND=$1
 case $COMMAND in

http://git-wip-us.apache.org/repos/asf/kafka/blob/15722745/bin/zookeeper-server-start.sh
----------------------------------------------------------------------
diff --git a/bin/zookeeper-server-start.sh b/bin/zookeeper-server-start.sh
index 4287774..bd9c114 100755
--- a/bin/zookeeper-server-start.sh
+++ b/bin/zookeeper-server-start.sh
@@ -5,9 +5,9 @@
 # The ASF licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
 # the License.  You may obtain a copy of the License at
-# 
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@ if [ "x$KAFKA_HEAP_OPTS" = "x" ]; then
     export KAFKA_HEAP_OPTS="-Xmx512M -Xms512M"
 fi
 
-EXTRA_ARGS="-name zookeeper -loggc"
+EXTRA_ARGS=${EXTRA_ARGS-'-name zookeeper -loggc'}
 
 COMMAND=$1
 case $COMMAND in


Mime
View raw message