Stefan Miklosovic
2a4cd36475
Prepare debian changelog for 4.1.3
2023-07-18 22:04:57 +02:00
Stefan Miklosovic
292e26842a
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-07-18 11:29:43 +02:00
Stefan Miklosovic
2584f4f070
increment version to 4.0.12
2023-07-18 11:26:19 +02:00
Brandon Williams
7524ed5bfe
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-07-17 11:32:49 -05: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
Bereng
2af60dced2
Test failure: org.apache.cassandra.distributed.test.ByteBuddyExamplesTest.countTest
2023-07-14 08:21:11 +02:00
Jacek Lewandowski
17afd5e6be
Merge branch 'cassandra-4.0' into cassandra-4.1
...
* cassandra-4.0:
Moved jflex from runtime to build dependencies
2023-07-13 15:33:12 +02: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
e4dd486734
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-07-12 22:01:53 +02:00
Stefan Miklosovic
f8584b943e
Prepare debian changelog for 4.0.11
2023-07-12 21:47:08 +02:00
Stefan Miklosovic
d320cef8f9
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-07-12 12:21:03 +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
461987627b
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-07-10 10:05:21 -05: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
2b2732450c
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-07-07 10:48:05 -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
78ad91313f
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-07-06 10:07:23 -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
cc09dd3e2b
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-07-06 09:51:30 -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
4a9fafb310
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-07-05 10:08:20 -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
d2ad51c2f6
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-07-04 13:46:51 +02: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
Caleb Rackliffe
c3327855e4
Add a virtual table that exposes currently running queries
...
patch by Chris Lohfink; reviewed by Caleb Rackliffe and Benedict Elliott Smith for CASSANDRA-15241
Co-authored-by: Chris Lohfink <clohfink@apple.com>
Co-authored-by: Caleb Rackliffe <calebrackliffe@gmail.com>
Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
2023-06-28 14:27:37 -05:00
Stefan Miklosovic
a57f0396fa
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-06-28 16:33:08 +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
e5aa88a138
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-06-28 06:06:08 -05: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
0dd69ab854
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-06-26 14:09:29 +02: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
41e62e6147
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-06-26 06:07:53 -05: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