Commit Graph

27228 Commits

Author SHA1 Message Date
Stefan Miklosovic e9f8f2efa2
Prepare debian changelog for 4.0.9 2023-04-11 09:31:56 +02:00
Brandon Williams 7d84ad9366 Revert "fix error in conflict edit"
This reverts commit 21c3e9731c.
2023-04-07 13:42:18 -05:00
Brandon Williams 5d315f869d Merge branch 'cassandra-3.11' into cassandra-4.0 2023-04-07 13:41:56 -05:00
Lorina Poland 21c3e9731c fix error in conflict edit 2023-04-07 11:14:33 -07:00
Lorina Poland 9a3a37c5b3 DOC - Added :stem: latexmath to Data Modeling page to fix display of equations
patch by Lorina Poland; reviewed by Erick Ramirez for CASSANDRA-16906
2023-04-07 11:14:33 -07:00
Brandon Williams 30639d8852 Suppress CVE-2022-45688
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18389
2023-04-07 11:14:33 -07:00
Stefan Miklosovic 03be6d7926
update zstd-jni library to version 1.5.5
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-18429
2023-04-06 23:24:16 +02:00
Lorina Poland 83dd275d5d DOC - Added :stem: latexmath to Data Modeling page to fix display of equations
patch by Lorina Poland; reviewed by Erick Ramirez for CASSANDRA-16906
2023-04-05 11:19:31 -07:00
Stefan Miklosovic 99f62b7338
Prepare debian changelog for 4.0.9 2023-04-04 09:29:07 +02:00
Josh McKenzie f6fce7ab51 Improve debuggability and correctness of ref detection
This patch is a backport of CASSANDRA-17205 and also raises
logging level to 'error' from 'warn' in StrongLeakDetector.

Patch by jmckenzie; reviewed by smiklosovic for CASSANDRA-18332
2023-04-03 16:03:33 -04:00
Maxim Muzafarov b3256f5bf2
Fix the number of running trees per thread for LongBTreeTest hanging test
patch by Maxim Muzafarov; reviewed by Mick Semb Wever for CASSANDRA-18131
2023-04-03 15:07:34 +02:00
Brandon Williams d41e69a652 Suppress CVE-2022-45688
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18389
2023-04-03 06:09:36 -05:00
Brandon Williams ed904a72f4 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-04-03 06:04:12 -05:00
Brandon Williams f9364e4f44 Suppress CVE-2022-45688
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18389
2023-04-03 05:57:00 -05:00
Caleb Rackliffe 853ae8c840 Avoid loading the preferred IP for BulkLoader streaming
patch by Caleb Rackliffe; reviewed by Jon Meredith for CASSANDRA-18370

Co-authored-by: Caleb Rackliffe <calebrackliffe@gmail.com>
Co-authored-by: Jon Meredith <jonmeredith@apache.org>
2023-03-31 11:57:29 -05:00
Jacek Lewandowski 4b9c18235a Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Save host id to system.local and flush immediately after startup
2023-03-31 17:30:20 +02:00
Jacek Lewandowski ee586b53c2 Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Save host id to system.local and flush immediately after startup
  Remove asf.yaml from non-trunk branches
  Notify the corresponding JIRA issue as soon as the PR is raised
2023-03-31 17:30:19 +02:00
Jacek Lewandowski f96659c530 Save host id to system.local and flush immediately after startup
patch by Adriano Bonacin and Jacek Lewandowski; reviewed by Stefan Miklosovic and Sam Tunnicliffe for CASSANDRA-18153
2023-03-31 17:30:18 +02:00
Brandon Williams 20bf2273a0 Remove asf.yaml from non-trunk branches 2023-03-30 08:40:15 -05:00
Maxim Muzafarov 24f5b64f26 Notify the corresponding JIRA issue as soon as the PR is raised
Patch by Maxim Muzafarov; reviewed by brandonwilliams and smiklosovic
for CASSANDRA-18372
2023-03-30 08:40:15 -05:00
Brandon Williams 5f61645778 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-03-29 06:32:13 -05:00
Brandon Williams c4535a2e2a Merge branch 'cassandra-3.0' into cassandra-3.11 2023-03-29 06:32:09 -05:00
Brandon Williams 2f8d11335e Remove asf.yaml from non-trunk branches 2023-03-29 06:32:05 -05:00
Brandon Williams 5b877b9d2b Merge branch 'cassandra-3.11' into cassandra-4.0 2023-03-29 06:26:15 -05:00
Brandon Williams 11b84d2ef2 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-03-29 06:25:59 -05:00
Maxim Muzafarov f352f2b637 Notify the corresponding JIRA issue as soon as the PR is raised
Patch by Maxim Muzafarov; reviewed by brandonwilliams and smiklosovic
for CASSANDRA-18372
2023-03-29 06:24:34 -05:00
Jacek Lewandowski 2974810607 Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Fix RepairJob unnecessarily reporting cancellation error
2023-03-21 10:09:31 +01:00
Jacek Lewandowski 955cf156c8 Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Fix RepairJob unnecessarily reporting cancellation error
2023-03-21 10:08:12 +01:00
Jacek Lewandowski f6a04ca81f Fix RepairJob unnecessarily reporting cancellation error
patch by Jacek Lewandowski; reviewed by Brandon Williams for CASSANDRA-17701
2023-03-21 10:04:24 +01:00
Jacek Lewandowski 5104008db9 Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Fix the ordering of sstables when running sstableupgrade tool
2023-03-14 15:16:22 +01:00
Jacek Lewandowski 58d06d34ab Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Fix the ordering of sstables when running sstableupgrade tool
2023-03-14 15:14:31 +01:00
Claude Warren 8df69c8016 Fix the ordering of sstables when running sstableupgrade tool
patch by Claude Warren; reviewed by Jacek Lewandowski and Stefan Miklosovic for CASSANDRA-18143
2023-03-14 14:52:53 +01:00
Jaroslaw Grabowski 3cfb222122 Fix BufferPool.memoryInUse counter
The counter was incorrectly decremented by the size of the unused portion of the provided buffer.
It is now decremented by the number of bytes actually returned to the pool (that may be different than "size"). The number is calculated as a difference between original and resulting buffer capacity.

patch by Jaroslaw Grabowski <jtgrabowski>, reviewed by Jacek Lewandowski <jacek-lewandowski> for CASSANDRA-18311
2023-03-13 09:51:33 +01:00
Andrés de la Peña 2aedb58123 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-03-10 11:51:25 +00:00
Andrés de la Peña 4b3cb0a772 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-03-10 11:50:04 +00:00
Andrés de la Peña 02048cffea Remove -l / -m / -h designation and have two options: free or paid tier circle config
patch by Andrés de la Peña; reviewed by Ekaterina Dimitrova and Josh McKenzie for CASSANDRA-18012
2023-03-10 11:48:31 +00:00
Brandon Williams a874e02eec Merge branch 'cassandra-3.11' into cassandra-4.0 2023-03-09 10:03:14 -06:00
Brandon Williams 326b5aceb1 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-03-09 10:02:21 -06:00
Brandon Williams be574fc34b Fix default file system error handler for disk_failure_policy die
Patch by Runtian Liu; reviewed by brandonwilliams and smiklosovic for
CASSANDRA-18294
2023-03-09 10:00:49 -06:00
Benedict Elliott Smith 40f9ca60f1 Improve memtable allocator accounting when updating AtomicBTreePartition
patch by Benedict Elliott Smith; reviewed by Benjamin Lerer, Jon Meredith for CASSANDRA-18125
2023-03-07 10:28:32 -07:00
Brandon Williams ccede05bf5 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-02-24 12:32:18 -06:00
Brandon Williams 4b84a8d7ac Merge branch 'cassandra-3.0' into cassandra-3.11 2023-02-24 12:29:37 -06:00
Brandon Williams 5374f56a0a Fix typo in suppressions 2023-02-24 12:28:59 -06:00
Brandon Williams 1d532bce7b Merge branch 'cassandra-3.11' into cassandra-4.0 2023-02-22 10:25:08 -06:00
Brandon Williams a5b05cea5e Merge branch 'cassandra-3.0' into cassandra-3.11 2023-02-22 10:24:22 -06:00
Brandon Williams eb36a86a72 Removing trailing year from copyright.
Patch by brandonwilliams; reviewed by mck for CASSANDRA-18261
2023-02-22 10:23:47 -06:00
Jon Meredith 3a4fff38b5 Ninja fix CASSANDRA-18242 - was not generating IDEA workspace for J11 correctly 2023-02-16 15:05:37 -07:00
Stefan Miklosovic fcc16f5f2b
Update zstd-jni to version 1.5.4-1
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-18259
2023-02-15 13:37:01 +01:00
Stefan Miklosovic 7b079503eb
Increment version to 4.0.9 2023-02-15 10:12:15 +01:00
Jon Meredith 4e0aad3319 Split and order IDEA workspace template VM_PARAMETERS
patch by Jon Meredith; reviewed by David Capwell for CASSANDRA-18242
2023-02-13 17:43:21 -07:00