Commit Graph

29419 Commits

Author SHA1 Message Date
Stefan Miklosovic 6c7ed52bb2
Add cqlshrc.sample and credentials.sample into Debian package
The underlying functionality for credentials.sample was firstly introduced in Cassandra 4.1

patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-18818
2023-09-05 15:36:31 +02:00
Mick Semb Wever b966f6af11
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Fix rpm installation on jdk17
2023-09-04 17:23:43 +02:00
Mick Semb Wever 17d0eb138c
Fix rpm installation on jdk17
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-18817
2023-09-04 16:59:27 +02:00
Stefan Miklosovic 9bacdc5bdb
Merge branch 'cassandra-5.0' into trunk 2023-09-04 10:10:46 +02:00
Stefan Miklosovic a18a822530
Merge branch 'cassandra-4.1' into cassandra-5.0 2023-09-04 10:10:37 +02:00
Stefan Miklosovic fcef3a2558
Merge branch 'cassandra-4.0' into cassandra-4.1 2023-09-04 10:09:12 +02:00
Daniel Jatnieks 0b7310c010
Fix FailingRepairTest by making sure Gossip is started before each test
patch by Daniel Jatnieks; reviewed by Brandon Williams and Stefan Miklosovic for CASSANDRA-18366
2023-09-04 10:03:22 +02:00
Bereng bd7dc322d8 Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Flaky test: org.apache.cassandra.cql3.validation.operations.InsertUpdateIfConditionTest
2023-09-04 09:22:55 +02:00
Bereng 52a8d2947a Flaky test: org.apache.cassandra.cql3.validation.operations.InsertUpdateIfConditionTest
patch by Berenguer Blasi; reviewed by Andres de la Peña for CASSANDRA-18393
2023-09-04 09:20:34 +02:00
Brad Schoening abe09cff34 Clean up obsolete functions and simplify cql_version handling in cqlsh
Patch by Brad Schoening; reviewed by brandonwilliams and edimitrova for
CASSANDRA-18787
2023-09-01 14:46:58 -05:00
Mick Semb Wever 5aa7da5ebd
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Prepare debian changelog for 5.0-alpha1
2023-09-01 11:51:28 +02:00
Mick Semb Wever b4d99c1a07
Prepare debian changelog for 5.0-alpha1 2023-09-01 11:23:00 +02:00
Mick Semb Wever 1c3c5008f9
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Missing license info and headers
2023-08-31 22:44:38 +02:00
Mick Semb Wever 865954fd99
Merge branch 'cassandra-4.1' into cassandra-5.0
* cassandra-4.1:
  Missing license info and headers
2023-08-31 22:43:33 +02:00
Mick Semb Wever 20125c5053
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Missing license info and headers
2023-08-31 22:41:56 +02:00
Mick Semb Wever aa2494b30b
Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Missing license info and headers
2023-08-31 22:39:56 +02:00
Mick Semb Wever 14e89fc3c7
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Missing license info and headers
2023-08-31 22:36:33 +02:00
Mick Semb Wever ce49e775f7
Missing license info and headers
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-18807
2023-08-31 22:30:42 +02:00
Stefan Miklosovic 1f1ec5f503
Merge branch 'cassandra-5.0' into trunk 2023-08-31 10:39:59 +02:00
Stefan Miklosovic 3d5b5343e0
Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-31 10:38:04 +02:00
Stefan Miklosovic d4cb791bdd
Merge branch 'cassandra-4.0' into cassandra-4.1 2023-08-31 10:35:42 +02:00
Stefan Miklosovic 94043fa9c6
Merge branch 'cassandra-3.11' into cassandra-4.0 2023-08-31 10:34:02 +02:00
Stefan Miklosovic be0c563097
Merge branch 'cassandra-3.0' into cassandra-3.11 2023-08-31 10:30:51 +02:00
Stefan Miklosovic 8bbf92a670
Refactor validation logic in StorageService.rebuild
patch by Stefan Miklosovic; reviewed by Ariel Weisberg for CASSANDRA-18803
2023-08-31 09:54:57 +02:00
Stefan Miklosovic 999d263a5d
Merge branch 'cassandra-5.0' into trunk 2023-08-30 21:45:48 +02:00
Stefan Miklosovic 988a855a80
Fix Depends and Build-Depends for Java for Debian packages
patch by Stefan Miklosovic; reviewed by Brandon Williams from CASSANDRA-18809
2023-08-30 21:43:28 +02:00
Ekaterina Dimitrova 4621ec7782 Merge branch 'cassandra-5.0' into trunk 2023-08-30 10:51:35 -04:00
Ekaterina Dimitrova ae8abf5cd6 Closing some JDK internals post jamm upgrade
patch by Ekaterina Dimitrova; reviewed by Benjamin Lerer for CASSANDRA-18439
2023-08-30 10:47:01 -04:00
Andrés de la Peña e9b9f9a35f Merge branch 'cassandra-5.0' into trunk 2023-08-30 15:21:33 +01:00
Andrés de la Peña 637a427274 Add missing features to the page listing the 5.0 new features
patch by Andrés de la Peña; reviewed by Stefan Miklosovic for CASSANDRA-18794
2023-08-30 15:15:04 +01:00
Jon Meredith 16dc2a2393 Merge branch 'cassandra-5.0' into trunk 2023-08-29 10:44:00 -06:00
Jon Meredith d4d0abcd03 Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-29 10:42:53 -06:00
Jon Meredith bde4fa0013 Waiting indefinitely on ReceivedMessage response in StreamSession#receive() can cause deadlock
patch by Jon Meredith; reviewed by Caleb Rackliffe, David Capwell for CASSANDRA-18733
2023-08-29 10:42:03 -06:00
Jon Meredith 70766c7ae9 Merge branch 'cassandra-5.0' into trunk 2023-08-28 15:38:36 -06:00
Jon Meredith 24cfe27ea5 Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-28 15:37:25 -06:00
Jon Meredith 251ae80bb0 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-08-28 15:34:34 -06:00
Francisco Guerrero 6ffa43f68b Support Dynamic Port Allocation for in-jvm dtest framework
patch by Francisco Guerrero; reviewed by Dinesh Joshi, Jon Meredith, Yifan Cai for CASSANDRA-18722
2023-08-28 15:29:14 -06:00
Brandon Williams 7750a9430b Merge branch 'cassandra-5.0' into trunk 2023-08-28 09:49:24 -05:00
Brandon Williams b670b7b0c8 Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-28 09:48:18 -05:00
Derek Chen-Becker 5e2985f10e Ensure unit tests honor tmp.dir
Modify unit tests so that any files created are rooted in the directory
specified by the "tmp.dir" Ant property. Ant already passes the value of
tmp.dir to the JVM's java.io.tmpdir parameter, so the primary changes are
to make use of Files.createTempDirectory to generate per-test work
directories. Also update the test checkstyle rules to catch any future
usage of hardcoded "/tmp".

Patch by Derek Chen-Becker; reviewed by bereng and brandonwilliams for CASSANDRA-18750
2023-08-28 09:47:13 -05:00
Ekaterina Dimitrova b04c2aeddc Merge branch 'cassandra-5.0' into trunk 2023-08-28 09:52:31 -04:00
Ekaterina Dimitrova 046c8447ec Update commons-lang3 to 3.13.0
patch by Ekaterina Dimitrova; reviewed by Berenguer Blasi for CASSANDRA-18789
2023-08-28 09:43:50 -04:00
Ekaterina Dimitrova 269c04474f Merge branch 'cassandra-5.0' into trunk 2023-08-28 09:29:10 -04:00
Ekaterina Dimitrova e4c97f1925 CircleCI: Fix BASE_BRANCH in generate.sh
patch by Ekaterina Dimitrova; reviewed by Andres de la Pena and Michael Semb Wever for CASSANDRA-18797
2023-08-28 09:24:59 -04:00
Brandon Williams 052a264741 Merge branch 'cassandra-5.0' into trunk 2023-08-28 06:14:45 -05:00
Brandon Williams c611632eb5 SamplingManager samples before cancelling.
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18065
2023-08-28 06:14:29 -05:00
Stefan Miklosovic 9e90ccc90f
Merge branch 'cassandra-5.0' into trunk 2023-08-28 10:04:05 +02:00
Stefan Miklosovic a9606c6f4b
Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-28 09:58:41 +02:00
Andy Tolbert b47bee42d3
Allow empty keystore_password in encryption_options
patch by Andy Tolbert; reviewed by Jon Meredith and Stefan Miklosovic for CASSANDRA-18778
2023-08-28 09:47:54 +02:00
Jon Meredith 6fb82b75d5 Merge branch 'cassandra-5.0' into trunk 2023-08-24 16:45:40 -06:00