This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/master by this push:
new a81e9a7 fix jmx_auth_test.TestJMXAuth.test_basic_auth after
CASSANDRA-14305
a81e9a7 is described below
commit a81e9a754ac7b56c5c1669970463578304b21105
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Tue Jun 4 17:01:46 2019 +1000
fix jmx_auth_test.TestJMXAuth.test_basic_auth after CASSANDRA-14305
---
tools/jmxutils.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/jmxutils.py b/tools/jmxutils.py
index dbc6e75..6986129 100644
--- a/tools/jmxutils.py
+++ b/tools/jmxutils.py
@@ -136,7 +136,7 @@ def apply_jmx_authentication(node):
(r'#\$env:JVM_OPTS="\$env:JVM_OPTS
-Dcassandra.jmx.remote.login.config=CassandraLogin"',
'$env:JVM_OPTS="$env:JVM_OPTS
-Dcassandra.jmx.remote.login.config=CassandraLogin"'),
(r'#\$env:JVM_OPTS="\$env:JVM_OPTS
-Djava.security.auth.login.config=C:/cassandra-jaas.config"',
- r'$env:JVM_OPTS="$env:JVM_OPTS
-Djava.security.auth.login.config=$env:CASSANDRA_HOME\conf\cassandra-jaas.config"'),
+ r'$env:JVM_OPTS="$env:JVM_OPTS
-Djava.security.auth.login.config=$env:CASSANDRA_CONF\cassandra-jaas.config"'),
(r'#\$env:JVM_OPTS="\$env:JVM_OPTS
-Dcassandra.jmx.authorizer=org.apache.cassandra.auth.jmx.AuthorizationProxy"',
'$env:JVM_OPTS="$env:JVM_OPTS
-Dcassandra.jmx.authorizer=org.apache.cassandra.auth.jmx.AuthorizationProxy"')
] if common.is_win() else [
@@ -146,8 +146,8 @@ def apply_jmx_authentication(node):
'#JVM_OPTS="$JVM_OPTS
-Dcom.sun.management.jmxremote.password.file=/etc/cassandra/jmxremote.password"'),
(r'#JVM_OPTS="\$JVM_OPTS
-Dcassandra.jmx.remote.login.config=CassandraLogin"',
'JVM_OPTS="$JVM_OPTS
-Dcassandra.jmx.remote.login.config=CassandraLogin"'),
- (r'#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_HOME/conf/cassandra-jaas.config"'),
+ (r'#JVM_OPTS="\$JVM_OPTS
-Djava.security.auth.login.config=\$CASSANDRA_CONF/cassandra-jaas.config"',
+ 'JVM_OPTS="$JVM_OPTS
-Djava.security.auth.login.config=$CASSANDRA_CONF/cassandra-jaas.config"'),
(r'#JVM_OPTS="\$JVM_OPTS
-Dcassandra.jmx.authorizer=org.apache.cassandra.auth.jmx.AuthorizationProxy"',
'JVM_OPTS="$JVM_OPTS
-Dcassandra.jmx.authorizer=org.apache.cassandra.auth.jmx.AuthorizationProxy"')
]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
