This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from deadaea157 Merge branch 'cassandra-5.0' into trunk
add c9717b4ed5 Redact security-sensitive information in
system_views.settings
add e45a330f54 Merge branch 'cassandra-4.1' into cassandra-5.0
new 63fb8741b8 Merge branch 'cassandra-5.0' into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
.../apache/cassandra/config/EncryptionOptions.java | 6 +++
.../apache/cassandra/config/JMXServerOptions.java | 3 +-
.../org/apache/cassandra/config/Properties.java | 21 +++++++++
.../CassandraUsage.java => config/Redacted.java} | 18 +++++---
.../apache/cassandra/db/virtual/SettingsTable.java | 22 +++++++++
.../cassandra/db/virtual/SettingsTableTest.java | 53 ++++++++++++++++++++++
7 files changed, 116 insertions(+), 8 deletions(-)
copy src/java/org/apache/cassandra/{tools/nodetool/layout/CassandraUsage.java
=> config/Redacted.java} (68%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
