Brandon Williams
2fa7c1204c
Merge branch 'cassandra-3.11' into cassandra-4.0
2023-10-26 05:59:42 -05:00
Brandon Williams
349ec3e02d
Merge branch 'cassandra-3.0' into cassandra-3.11
2023-10-26 05:58:22 -05:00
Brandon Williams
0a91114dd5
Merge branch 'cassandra-3.11' into cassandra-4.0
2023-10-26 05:56:47 -05:00
Brandon Williams
cec0e1b864
Merge branch 'cassandra-3.0' into cassandra-3.11
2023-10-26 05:55:46 -05:00
Brandon Williams
5bf1d2f8d5
Suppress CVE-2023-44487
...
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18943
2023-10-26 05:54:19 -05:00
Andrés de la Peña
e8c5fe31a2
Merge branch 'cassandra-5.0' into trunk
2023-10-25 12:15:26 +01:00
Andrés de la Peña
5eba52feb8
Add cqlsh autocompletion for the vector data type
...
patch by Andrés de la Peña; reviewed by Brandon Williams for CASSANDRA-18946
2023-10-25 11:54:01 +01:00
Stefan Miklosovic
3d022d3c5f
Merge branch 'cassandra-5.0' into trunk
2023-10-25 08:41:13 +02:00
maxwellguo
0c7410a9da
Fix nodetool tablehistograms output to avoid printing repeated information and ensure at most two arguments
...
patch by Maxwell Guo; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-18955
2023-10-25 08:38:13 +02:00
Stefan Miklosovic
b094303ac2
Merge branch 'cassandra-5.0' into trunk
2023-10-24 16:46:31 +02:00
Stefan Miklosovic
9ffb838d03
Merge branch 'cassandra-4.1' into cassandra-5.0
2023-10-24 16:32:37 +02:00
Stefan Miklosovic
d6bf4fd98f
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-10-24 16:26:07 +02:00
Stefan Miklosovic
d6fcca95b4
Merge branch 'cassandra-3.11' into cassandra-4.0
2023-10-24 16:20:31 +02:00
Stefan Miklosovic
3987160bb2
Merge branch 'cassandra-3.0' into cassandra-3.11
2023-10-24 16:14:49 +02:00
Stefan Miklosovic
b51ee83a29
Fix nodetool enable/disablebinary to correctly set rpc readiness in gossip
...
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-18935
2023-10-24 16:12:37 +02:00
Stefan Miklosovic
afde441448
Merge branch 'cassandra-5.0' into trunk
2023-10-23 12:48:20 +02:00
Stefan Miklosovic
e2d2bd61f4
ninja-fix nested cassandra clone for dtest jar building re-use check
...
(git -C … will fall back to parent level .git repo, confusing the check)
patch by Mick Semb Wever; reviewed by Štefan Miklošovič for CASSANDRA-18936,CASSANDRA-18665
2023-10-23 12:28:38 +02:00
Caleb Rackliffe
bf321d7951
Merge branch 'cassandra-5.0' into trunk
...
* cassandra-5.0:
Change the checksum algorithm SAI-related files use from CRC32 to CRC32C
2023-10-20 14:51:35 -05:00
Maxim Muzafarov
07df26778b
Change the checksum algorithm SAI-related files use from CRC32 to CRC32C
...
patch by Maxim Muzafarov; reviewed by Caleb Rackliffe and Zhao Yang for CASSANDRA-18836
2023-10-20 14:46:49 -05:00
Brandon Williams
06202c9ff3
Merge branch 'cassandra-5.0' into trunk
2023-10-19 12:29:22 -05:00
Francisco Guerrero
8c89e2adb7
Correct comment for nc SSTable format
...
Patch by frankgh; reviewd by brandonwilliams and bereng for
CASSANDRA-18933
2023-10-19 12:27:57 -05:00
Stefan Miklosovic
088f3ea3e9
Merge branch 'cassandra-5.0' into trunk
2023-10-19 15:27:57 +02:00
mck
0aff36fc74
When generating dtest jars and switching between branches, do git clean before git reset
...
patch by Mick Semb Wever; reviewed by Stefan Miklosovic for CASSANDRA-18936
2023-10-19 15:26:27 +02:00
Jacek Lewandowski
c2c20ab843
Merge branch 'cassandra-5.0' into trunk
...
* cassandra-5.0:
Fixed the inconsistency between distributedKeyspaces and distributedAndLocalKeyspaces
2023-10-19 12:56:11 +02:00
Jacek Lewandowski
57f494d8d4
Merge branch 'cassandra-4.1' into cassandra-5.0
...
* cassandra-4.1:
Fixed the inconsistency between distributedKeyspaces and distributedAndLocalKeyspaces
2023-10-19 12:56:10 +02:00
Jacek Lewandowski
ac71d0f56e
Fixed the inconsistency between distributedKeyspaces and distributedAndLocalKeyspaces
...
Patch by Jacek Lewandowski; reviewed by Benjamin Lerer, Berenguer Blasi, Ekaterina Dimitrova, Jeremiah Jordan for CASSANDRA-18747
2023-10-19 12:56:09 +02:00
Caleb Rackliffe
7d3a8d5312
Merge branch 'cassandra-5.0' into trunk
...
* cassandra-5.0:
Correctly remove Index.Group from IndexRegistry
2023-10-18 13:57:42 -05:00
Mike Adamson
e45c1092f9
Correctly remove Index.Group from IndexRegistry
...
The Index.Group was being left in the list indexGroups in the SecondaryIndexManager because the incorrect
key was being used to remove it from the map
patch by Mike Adamson; reviewed by Caleb Rackliffe and Zhao Yang for CASSANDRA-18905
Co-authored-by: Zhao Yang <zhaoyangsingapore@gmail.com>
2023-10-18 13:43:41 -05:00
Stefan Miklosovic
6c18a6c4f4
Merge branch 'cassandra-5.0' into trunk
2023-10-18 20:04:30 +02:00
Stefan Miklosovic
269285213d
Add versions into Deprecated annotation
...
patch by Stefan Miklosovic; reviewed by Maxim Muzafarov, Brandon Williams for CASSANDRA-18912
Co-authored-by: Maxim Muzafarov <maxmuzaf@gmail.com>
2023-10-18 19:54:10 +02:00
Stefan Miklosovic
2feeb39d5a
Merge branch 'cassandra-5.0' into trunk
2023-10-18 12:58:34 +02:00
Stefan Miklosovic
a4fc03e799
Merge branch 'cassandra-4.1' into cassandra-5.0
2023-10-18 12:57:06 +02:00
Stefan Miklosovic
ede18e6c9f
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-10-18 12:55:49 +02:00
Stefan Miklosovic
85285fa0f9
Merge branch 'cassandra-3.11' into cassandra-4.0
2023-10-18 12:54:15 +02:00
Stefan Miklosovic
6212b0aaa5
Merge branch 'cassandra-3.0' into cassandra-3.11
2023-10-18 12:52:19 +02:00
maoling
f27c6c8e6e
Implement the logic in bin/stop-server
...
patch by Ling Mao; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-18838
Co-authored-by: Stefan Miklosovic <smiklosovic@apache.org>
2023-10-18 12:49:58 +02:00
mck
3d15be1d5e
Merge branch 'cassandra-5.0' into trunk
...
* cassandra-5.0:
ninja-fix – reusing git clone under build needs reset and permissions
2023-10-17 12:15:22 +02:00
mck
802bd5fe13
ninja-fix – reusing git clone under build needs reset and permissions
...
ref: https://the-asf.slack.com/archives/CK23JSY2K/p1697465832946299
patch by Mick Semb Wever; reviewed by Štefan Miklošovič, Maxim Muzafarov for CASSANDRA-18665
2023-10-17 12:14:21 +02:00
Mick Semb Wever
302b272b14
Merge branch 'cassandra-5.0' into trunk
...
* cassandra-5.0:
Fixes for in-tree scripts: offline mode, maybe-build for fqltool-test, jvm-dtest-upgrade
2023-10-16 16:02:29 +02:00
Mick Semb Wever
987d03c142
Fixes for in-tree scripts: offline mode, maybe-build for fqltool-test, jvm-dtest-upgrade
...
- jvm-dtest-upgrade script running in ci-cassandra.a.o (needs default bash)
- add offline mode (to avoid `git fetch` before building dtest-jars on other branches),
- avoid rebuilding in fqltool-test target, as is standard for test targets.
- python detection and override
- FileTest cleanup (tmp directory was left unreadable and undeletable)
- reuse ~/.ccm (like normal)
- remove support for python 3.6
- remove docker volumes in image (they are added at run time)
- remove superfluousjava version debug
– extra mount for build/tmp as hack to prevent buggy hardlinks on overlay
patch by Mick Semb Wever; reviewed by Brandon Williams, Ekaterina Dimitrova, Josh McKenzie, Maxim Muzafarov for CASSANDRA-18665
2023-10-16 16:01:28 +02:00
Bereng
a9a09c1e6b
Merge branch 'cassandra-5.0' into trunk
...
* cassandra-5.0:
Test failure: org.apache.cassandra.tools.nodetool.ForceCompactionTest.forceCompactMultipleRowsTombstoneTest-.jdk11
2023-10-16 12:25:47 +02:00
Bereng
25da086336
Test failure: org.apache.cassandra.tools.nodetool.ForceCompactionTest.forceCompactMultipleRowsTombstoneTest-.jdk11
...
patch by Berenguer Blasi; reviewed by Brandon Williams for CASSANDRA-18881
2023-10-16 12:23:00 +02:00
Mick Semb Wever
91f5562241
Merge branch 'cassandra-5.0' into trunk
...
* cassandra-5.0:
ninja-fix remove all DSE references
2023-10-12 09:22:51 +02:00
Lorina Poland
45cf5edb37
ninja-fix remove all DSE references
...
patch by Lorina Poland; reviewed by Mick Semb Wever for CASSANDRA-18231
2023-10-12 09:20:33 +02:00
Stefan Miklosovic
a0b4cee198
Merge branch 'cassandra-5.0' into trunk
2023-10-12 08:39:57 +02:00
Maxim Muzafarov
49f216f37b
Update documentation metrics page according to the library upgrade
...
patch by Maxim Muzafarov; reviewed by Stefan Miklosovic, Michael Semb Wever for CASSANDRA-18909
2023-10-12 08:38:02 +02:00
David Capwell
b8b17dc5db
Merge branch 'cassandra-5.0' into trunk
2023-10-10 14:20:20 -07:00
David Capwell
210ced3b7b
Merge branch 'cassandra-4.1' into cassandra-5.0
2023-10-10 14:15:49 -07:00
David Capwell
1920571861
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-10-10 14:07:17 -07:00
David Capwell
2bab3f27ba
Gossip NPE due to shutdown event corrupting empty statuses
...
patch by David Capwell; reviewed by Brandon Williams for CASSANDRA-18913
2023-10-10 14:05:15 -07:00