Commit Graph

27401 Commits

Author SHA1 Message Date
Daniel Jatnieks 4a2a585ec0 Fix BulkLoader ignoring cipher suites options.
patch by Dan Jatnieks; reviewed by Ekaterina Dimitrova and Jon Meredith for CASSANDRA-18582
2023-08-01 13:49:29 -04:00
Ekaterina Dimitrova 31f65c12de Merge branch 'cassandra-3.11' into cassandra-4.0 2023-07-28 14:38:08 -04:00
Ekaterina Dimitrova bee215cce6 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-07-28 14:35:16 -04:00
Ekaterina Dimitrova 39db44adff Fix dtest-jar
patch by Ekaterina Dimitrova; reviewed by Brandon Williams for CASSANDRA-15255
2023-07-28 14:31:17 -04:00
Stefan Miklosovic a0fdda1976
Remove AssertJ from the production code
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-18700
2023-07-28 17:09:52 +02:00
vgali7 b4b9f31983
Migrate Python optparse to argparse
patch by Vineet Gali; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-17914
2023-07-25 09:54:09 +02:00
Stefan Miklosovic 2584f4f070
increment version to 4.0.12 2023-07-18 11:26:19 +02:00
Marianne Lyne Manaog a7bf85c4f3 Add jvm/test args to microbench
Patch by Marianne Lyne Manaog; reviewed by brandonwilliams and
edimitrova for CASSANDRA-18658
2023-07-17 11:29:19 -05:00
Jacek Lewandowski 4f0865f769 Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Moved jflex from runtime to build dependencies
2023-07-13 15:33:11 +02:00
Jacek Lewandowski 32afc93b0d Moved jflex from runtime to build dependencies
Patch by Jacek Lewandowski; reviewed by Berenguer Blasi, Mick Semb Wever and Stefan Miklosovic for CASSANDRA-18664
2023-07-13 15:33:10 +02:00
Stefan Miklosovic f8584b943e
Prepare debian changelog for 4.0.11 2023-07-12 21:47:08 +02:00
Stefan Miklosovic 92c0459199
Merge branch 'cassandra-3.11' into cassandra-4.0 2023-07-12 12:20:00 +02:00
Stefan Miklosovic 7ec5126870
Fix CAST function for float to decimal
patch by Stefan Miklosovic; reviewed by Andres de la Peña and Brandon Williams for CASSANDRA-18647
2023-07-12 12:18:46 +02:00
Brandon Williams 6fa548f9e9 Revert "Allow internal address to change with reconnecting snitches"
This reverts commit b791644fda.

Patch by brandonwilliams; reviewed by bereng for CASSANDRa-18560
2023-07-10 10:04:32 -05:00
Brandon Williams 309e9b1295 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-07-07 10:47:36 -05:00
Brandon Williams 3f09baf1c2 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-07-07 10:45:11 -05:00
Brandon Williams 493d15fffa Upgrade to OWASP 8.3.1
Patch by brandonwilliams; reviewed by edimitrova for CASSANDRA-18650
2023-07-07 10:40:37 -05:00
Brandon Williams c10c7375c1 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-07-06 10:07:12 -05:00
Brandon Williams 5326a39a1c Merge branch 'cassandra-3.0' into cassandra-3.11 2023-07-06 09:59:13 -05:00
Brandon Williams 7150cc5b99 Suppress CVE-2023-34462
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18649
2023-07-06 09:58:19 -05:00
Brandon Williams 822589e382 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-07-06 09:50:50 -05:00
Brandon Williams d302b837b2 Suppress CVE-2022-45688
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18643
2023-07-06 09:49:56 -05:00
Brandon Williams 0c79b2857a Merge branch 'cassandra-3.11' into cassandra-4.0 2023-07-05 10:07:47 -05:00
Brandon Williams 00cf31882b Ninja fix my bad merge 2023-07-05 10:07:34 -05:00
Stefan Miklosovic 0a53770ddc
Merge branch 'cassandra-3.11' into cassandra-4.0 2023-07-04 13:45:30 +02:00
Vincent White 028ea02a4a
Remove unrepaired SSTables from garbage collection when only_purge_repaired_tombstones is true
patch by Vincent White; reviewed by Stefan Miklosovic and Branimir Lambov for CASSANDRA-14204

Co-authored-by: Stefan Miklosovic <smiklosovic@apache.org>
2023-07-04 10:37:29 +02:00
Stefan Miklosovic b099aae3f0
Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-28 16:27:19 +02:00
Stefan Miklosovic b6fdc80456
Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-28 16:20:05 +02:00
Stefan Miklosovic 4ea7bb25b4
Add support for AWS Ec2 IMDSv2
patch by Stefan Miklosovic; reviewed by Jacek Lewandowski and Brandon Williams for CASSANDRA-16555

Co-authored-by: Jacek Lewandowski <lewandowski.jacek@gmail.com>
Co-authored-by: Paul Rütter <paul@blueconic.com>
2023-06-28 16:08:39 +02:00
Brandon Williams 0621658acd Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-28 06:05:43 -05:00
Brandon Williams 293f14cf36 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-28 06:04:26 -05:00
Brandon Williams de7b1584f8 Suppress CVE-2023-35116
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18630
2023-06-28 06:03:20 -05:00
Stefan Miklosovic 04fd3747cf
Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-26 14:06:40 +02:00
Stefan Miklosovic 55dc5b43f1
Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-26 14:01:24 +02:00
Stefan Miklosovic a00d1de441
Pass taskId from CompactionTask to system.compaction_history
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-12183
2023-06-26 13:55:49 +02:00
Brandon Williams 776b33753b Upgrade snappy to 1.1.10.1
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18608
2023-06-26 06:06:38 -05:00
Brandon Williams 72b1949157 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-26 06:05:24 -05:00
Brandon Williams b15a7da208 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-26 06:04:45 -05:00
Brandon Williams d99bccd649 Suppress CVE-2023-34455, CVE-2023-34454, CVE-2023-34453
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18608
2023-06-26 06:03:13 -05:00
Brandon Williams bc3700da05 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-21 18:00:01 -05:00
Brandon Williams 254991750c Add missing changes 2023-06-21 17:59:51 -05:00
Brandon Williams 76d11fdf51 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-21 06:26:43 -05:00
Brandon Williams ece247b6ee Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-21 06:26:30 -05:00
Stefan Podkowinski e67fa69114 Remove hard-coded SSL cipher suites and protocols
patch by Stefan Podkowinski; reviewed by Robert Stupp for CASSANDRA-10508

backported in CASSANDRA-18575 by German Eichberger; reviewed by
brandonwilliams
2023-06-21 06:25:18 -05:00
Maciej Sokol 92d0a40c96
Fix assertion error when describing mv as table
patch by Maciej Sokol; reviewed by Brandon Williams and Stefan Miklosovic for CASSANDRA-18596
2023-06-19 17:08:12 +02:00
Stefan Miklosovic 49dba85ec8
Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-15 13:16:44 +02:00
Cameron Zemek 64d953fdca
Wait for live endpoints in gossip waiting to settle
patch by Cameron Zemek; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-18543
2023-06-15 12:59:13 +02:00
Daniel Jatnieks c37bcbf7e9 Include TLSv1.2 in negotiatedProtocolMustBeAcceptedProtocolTest
Add a comment about the use of disabled TLSv1.1 with JDK 8 and higher to negotiatedProtocolMustBeAcceptedProtocolTest

Patch by Dan Jatnieks; reviewed by Ekaterina Dimitrova and Brandon Williams for CASSANDRA-18540
2023-06-14 14:00:03 -04:00
Brandon Williams 2fcdaa5b76 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-14 11:35:22 -05:00
ningzi.zhan 1eccb2bc1f Fix error message handling when trying to use CLUSTERING ORDER with non-clustering column
Patch by Ningzi Zhan and Tomasz Lasica; reviewed by brandonwilliams,
edimitrova and Maxwell Guo for CASSANDRA-17818

Co-Authored-By: Tomek Lasica <tomasz.lasica@datastax.com>
2023-06-14 11:34:03 -05:00