[hbase] branch master updated: HBASE-22145 windows hbase-env causes hbase cli/etc to ignore HBASE_OPTS

[ps...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

psomogyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new caa0535  HBASE-22145 windows hbase-env causes hbase cli/etc to ignore HBASE_OPTS
caa0535 is described below

commit caa05356a12ef2810a058ef1eae052510283cf32
Author: Sergey Shelukhin <se...@apache.org>
AuthorDate: Wed Jul 31 09:58:35 2019 +0200

    HBASE-22145 windows hbase-env causes hbase cli/etc to ignore HBASE_OPTS
---
 conf/hbase-env.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/hbase-env.cmd b/conf/hbase-env.cmd
index 8c8597e..1f1c3e3 100644
--- a/conf/hbase-env.cmd
+++ b/conf/hbase-env.cmd
@@ -40,7 +40,7 @@
 @rem see http://hbase.apache.org/book.html#performance
 @rem JDK6 on Windows has a known bug for IPv6, use preferIPv4Stack unless JDK7.
 @rem @rem See TestIPv6NIOServerSocketChannel.
-set HBASE_OPTS="-XX:+UseConcMarkSweepGC" "-Djava.net.preferIPv4Stack=true"
+set HBASE_OPTS=%HBASE_OPTS% "-XX:+UseConcMarkSweepGC" "-Djava.net.preferIPv4Stack=true"
 
 @rem Uncomment below to enable java garbage collection logging for the server-side processes
 @rem this enables basic gc logging for the server processes to the .out file