You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2019/05/27 01:32:16 UTC
[cassandra] branch cassandra-3.11 updated: Fix cassandra-env.sh to
use $CASSANDRA_CONF to find cassandra-jaas.config
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.11 by this push:
new 60bdfb1 Fix cassandra-env.sh to use $CASSANDRA_CONF to find cassandra-jaas.config
60bdfb1 is described below
commit 60bdfb1731d2bc0d63720d52d0f64c4d88791f33
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Mon May 27 11:24:23 2019 +1000
Fix cassandra-env.sh to use $CASSANDRA_CONF to find cassandra-jaas.config
Patch by Angelo Polo; Reviewed by Mick Semb Wever for CASSANDRA-14305
---
CHANGES.txt | 1 +
conf/cassandra-env.sh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 50e36d9..59c89b7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.5
+ * Fix cassandra-env.sh to use $CASSANDRA_CONF to find cassandra-jaas.config (CASSANDRA-14305)
* Fixed nodetool cfstats printing index name twice (CASSANDRA-14903)
* Add flag to disable SASI indexes, and warnings on creation (CASSANDRA-14866)
Merged from 3.0:
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 7f7081b..dc1ef22 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -283,7 +283,7 @@ JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.password.file=/etc/cassandra/
## which delegates to the IAuthenticator configured in cassandra.yaml. See the sample JAAS configuration
## file cassandra-jaas.config
#JVM_OPTS="$JVM_OPTS -Dcassandra.jmx.remote.login.config=CassandraLogin"
-#JVM_OPTS="$JVM_OPTS -Djava.security.auth.login.config=$CASSANDRA_HOME/conf/cassandra-jaas.config"
+#JVM_OPTS="$JVM_OPTS -Djava.security.auth.login.config=$CASSANDRA_CONF/cassandra-jaas.config"
## Cassandra also ships with a helper for delegating JMX authz calls to the configured IAuthorizer,
## uncomment this to use it. Requires one of the two authentication options to be enabled
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org