You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sm...@apache.org on 2023/08/28 08:15:06 UTC
[cassandra] branch trunk updated (6fb82b75d5 -> 9e90ccc90f)
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 6fb82b75d5 Merge branch 'cassandra-5.0' into trunk
add b47bee42d3 Allow empty keystore_password in encryption_options
add a9606c6f4b Merge branch 'cassandra-4.1' into cassandra-5.0
new 9e90ccc90f 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 +
.../security/FileBasedSslContextFactory.java | 10 +++----
test/conf/cassandra_ssl_test_nopassword.keystore | Bin 0 -> 2517 bytes
.../security/FileBasedSslContextFactoryTest.java | 31 ++++++++++-----------
4 files changed, 20 insertions(+), 22 deletions(-)
create mode 100644 test/conf/cassandra_ssl_test_nopassword.keystore
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
Posted by sm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9e90ccc90f352bfaf13835b58ea5c548e150a02b
Merge: 6fb82b75d5 a9606c6f4b
Author: Stefan Miklosovic <sm...@apache.org>
AuthorDate: Mon Aug 28 10:01:17 2023 +0200
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
.../security/FileBasedSslContextFactory.java | 10 +++----
test/conf/cassandra_ssl_test_nopassword.keystore | Bin 0 -> 2517 bytes
.../security/FileBasedSslContextFactoryTest.java | 31 ++++++++++-----------
4 files changed, 20 insertions(+), 22 deletions(-)
diff --cc CHANGES.txt
index a412b7a8d9,5e17fd8af5..2c043d558f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,19 -16,6 +9,20 @@@ Merged from 5.0
* Remove commitlog_sync_batch_window_in_ms (CASSANDRA-17161)
* Upgrade JMH from 1.21 to 1.36 (CASSANDRA-18696)
* Add guardrail for vector dimensions (CASSANDRA-18730)
+Merged from 4.1:
++ * Allow empty keystore_password in encryption_options (CASSANDRA-18778)
+Merged from 4.0:
+Merged from 3.11:
+ * Fix NPE when using udfContext in UDF after a restart of a node (CASSANDRA-18739)
+Merged from 3.0:
+ * Make alternation of a user type validate the same way as creation of a user type does (CASSANDRA-18585)
+ * Fix missing speculative retries in tablestats (CASSANDRA-18767)
+ * Fix Requires for Java for RPM package (CASSANDRA-18751)
+ * Fix CQLSH online help topic link (CASSANDRA-17534)
+ * Remove unused suppressions (CASSANDRA-18724)
+
+
+5.0
* Upgraded Netty to 4.1.96, added BouncyCastle dependency (CASSANDRA-17992)
* Fix for (unsupported) big endian unaligned architecture, eg s390x (CASSANDRA-17723)
* CIDR filtering authorizer (CASSANDRA-18592)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org