Commit Graph

28201 Commits

Author SHA1 Message Date
Stefan Miklosovic 0e21007b4f Merge branch 'cassandra-4.0' into cassandra-4.1 2022-10-27 16:06:19 +02:00
Stefan Miklosovic 35ef5b9957 Fix possible race condition on repair snapshots
patch by Stefan Miklosovic; reviewed by David Capwell for CASSANDRA-17955
2022-10-27 15:50:37 +02:00
Maxim Chanturiay dd53a609c6 Add --resolve-ip option to nodetool gossipinfo
patch by Maxim Chanturiay; reviewed by Stefan Miklosovic and Caleb Rackliffe for CASSANDRA-17934
2022-10-27 11:19:20 +02:00
Mick Semb Wever 50dc696198
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Increment versions to 3.0.29, 3.11.15, 4.0.8
2022-10-23 23:27:13 +02:00
Mick Semb Wever ac165325bc
Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Increment versions to 3.0.29, 3.11.15, 4.0.8
2022-10-23 23:26:55 +02:00
Mick Semb Wever ed07f7d6bc
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Increment versions to 3.0.29, 3.11.15, 4.0.8
2022-10-23 23:22:36 +02:00
Mick Semb Wever a3b4119b5a
Increment versions to 3.0.29, 3.11.15, 4.0.8 2022-10-23 23:18:45 +02:00
Stefan Miklosovic 9c7d9a36ba Merge branch 'cassandra-4.0' into cassandra-4.1 2022-10-21 10:08:20 +02:00
Stefan Miklosovic 8429229b7d Merge branch 'cassandra-3.11' into cassandra-4.0 2022-10-21 10:06:23 +02:00
Stefan Miklosovic 761d9f9516 Merge branch 'cassandra-3.0' into cassandra-3.11 2022-10-21 10:05:28 +02:00
Stefan Miklosovic 2b31675fbd Fix running Ant rat targets without git
patch by Stefan Miklosovic; reviewed by Michael Semb Wever for CASSANDRA-17974
2022-10-21 09:58:43 +02:00
Ekaterina Dimitrova 1df5dd671e Merge branch 'cassandra-4.0' into cassandra-4.1 2022-10-20 13:59:09 -04:00
Ekaterina Dimitrova ce1584ccc8 Fix ASM bytecode version inconsistency
patch by Ekaterina Dimitrova; reviewed by Berenguer Blasi and Benedict Elliot Smith for CASSANDRA-17873
2022-10-20 13:10:33 -04:00
Andrés de la Peña f90148a344 Merge branch 'cassandra-4.0' into cassandra-4.1 2022-10-19 12:50:21 +01:00
Andrés de la Peña a9df34c62a Merge branch 'cassandra-3.11' into cassandra-4.0 2022-10-19 12:49:45 +01:00
Andrés de la Peña c7d665dcc7 Merge branch 'cassandra-3.0' into cassandra-3.11 2022-10-19 12:48:49 +01:00
Andrés de la Peña 2b511c5714 ninja-fix: Fix bashisms on .circleci/generate.sh
patch by Andrés de la Peña; reviewed by Brandon Williams for CASSANDRA-17939
2022-10-19 12:47:59 +01:00
Mick Semb Wever 046bedaf55
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Prepare debian changelog for 4.0.7
  Prepare debian changelog for 3.11.14
  Prepare debian changelog for 3.0.28
2022-10-19 11:33:13 +02:00
Mick Semb Wever 3251b85def
Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Prepare debian changelog for 3.11.14
  Prepare debian changelog for 3.0.28
2022-10-19 11:32:42 +02:00
Mick Semb Wever d465ac2dc9
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Prepare debian changelog for 3.0.28
2022-10-19 11:32:23 +02:00
Mick Semb Wever 277fa4fca4
Prepare debian changelog for 4.0.7 2022-10-19 10:57:20 +02:00
Mick Semb Wever 9d3327ef13
Prepare debian changelog for 3.11.14 2022-10-19 10:27:41 +02:00
Mick Semb Wever 96c5332ee1
Prepare debian changelog for 3.0.28 2022-10-19 09:59:09 +02:00
Mick Semb Wever fbb3079144
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Fix JMX security vulnerabilities
2022-10-18 22:55:59 +02:00
Mick Semb Wever 9a24fa81e5
Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Fix JMX security vulnerabilities
2022-10-18 22:53:37 +02:00
Mick Semb Wever 95d0a936f9
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Fix JMX security vulnerabilities
2022-10-18 22:50:49 +02:00
Abe Ratnofsky b2660bcf78
Fix JMX security vulnerabilities
patch by Abe Ratnofsky; reviewed by Jon Meredith, Mick Semb Wever, Sam Tunnicliffe for CASSANDRA-17921
2022-10-18 22:47:49 +02:00
Brandon Williams 0aa4ef1a8e Merge branch 'cassandra-4.0' into cassandra-4.1 2022-10-18 11:18:32 -05:00
Brandon Williams a124f099e0 Merge branch 'cassandra-3.11' into cassandra-4.0 2022-10-18 11:16:51 -05:00
Brandon Williams 6b0cd7db04 Merge branch 'cassandra-3.0' into cassandra-3.11 2022-10-18 11:08:02 -05:00
Brandon Williams 3d4e6944ef Suppress CVE-2019-2684
Patch by brandonwilliams; reviewed by smiklosovic for CASSANDRA-17965
2022-10-18 11:02:50 -05:00
Andrés de la Peña 36e73bdf55 Merge branch 'cassandra-4.0' into cassandra-4.1 2022-10-18 16:53:48 +01:00
Andrés de la Peña cc622a20e1 Merge branch 'cassandra-3.11' into cassandra-4.0 2022-10-18 16:51:29 +01:00
Andrés de la Peña f13cdddcad Merge branch 'cassandra-3.0' into cassandra-3.11 2022-10-18 16:47:08 +01:00
Andrés de la Peña 9aa28a81ec CircleCI: Automatically detect and repeat new or modified JUnit tests
patch by Andrés de la Peña; reviewed by Josh McKenzie for CASSANDRA-17939
2022-10-18 16:44:37 +01:00
Brandon Williams 1e18eda3d9 Merge branch 'cassandra-4.0' into cassandra-4.1 2022-10-18 10:37:05 -05:00
Brandon Williams 4157e7a8e0 Merge branch 'cassandra-3.11' into cassandra-4.0 2022-10-18 10:33:24 -05:00
Brandon Williams 2e6528542b Suppress CVE-2022-42003 and CVE-2022-42004
Patch by brandonwilliams; reviewed by smiklosovic for CASSANDRA-17966
2022-10-18 10:26:57 -05:00
Stefan Miklosovic 15b54687a5 Merge branch 'cassandra-4.0' into cassandra-4.1 2022-10-11 23:20:35 +02:00
Stefan Miklosovic 488c0c75a8 Remove empty cq4 log files to prevent BinLog from failing to start
This patch also backports CASSANDRA-17595.

patch by Stefan Miklosovic; reviewed by Caleb Rackliffe for CASSANDRA-17933
2022-10-11 23:13:13 +02:00
Aleksey Yeschenko 3fc9bc033a Merge branch 'cassandra-4.0' into cassandra-4.1 2022-10-11 15:43:49 +01:00
Piotr Kołaczkowski e13356d75d Fix multiple BufferPool bugs
patch by Piotr Kołaczkowski; reviewed by Aleksey Yeschenko for
CASSANDRA-16681
2022-10-11 15:42:30 +01:00
Ariel Weisberg 9524c22990 Merge branch 'cassandra-4.0' into cassandra-4.1 2022-10-06 14:11:34 -04:00
Andy Tolbert 3bdd2caa22 Fix StorageService.getNativeaddress handling of IPv6 addresses
StorageService.getNativeaddress does not currently correctly handle
IPv6 addresses correctly when NATIVE_ADDRESS_AND_PORT are not present in
that it simply concatenates the IP address with the default native port,
e.g.:

0:0:0:0:0:0:5a:3:9042

This does not parse into an InetSocketAddress as the address and port
can't be disambiguated.

Such a case would usually be present when there are 3.x nodes present in a
cluster with 4.0 nodes.

Change updates RPC_ADDRESS and else case to create InetAddressAndPort instances
with DatabaseDescriptor.getNativeTransportPort and returns the
getHostAddress(withPort) which properly bracket encodes the address,
e.g.:

[0:0:0:0:0:0:5a:3]:9042

which can be parsed as an InetSocketAddress.

patch by Andy Tolbert; reviewed by Ariel Weisberg, Brandon Williams for CASSANDRA-17945
2022-10-06 14:10:58 -04:00
Aleksey Yeschenko fb4974d455 Merge branch 'cassandra-4.0' into cassandra-4.1 2022-10-06 16:48:12 +01:00
Aleksey Yeschenko 0c4daa1ddc Fix up CHANGES.txt chaos 2022-10-06 16:06:53 +01:00
Aleksey Yeschenko 0b083d3e73 Merge branch 'cassandra-4.0' into cassandra-4.1 2022-10-06 15:34:49 +01:00
Aleksey Yeschenko 4e1d31e729 Merge branch 'cassandra-3.11' into cassandra-4.0 2022-10-06 15:27:49 +01:00
Mick Semb Wever c4bccb000a
Increment version to 4.1-beta2 2022-10-05 17:14:37 -05:00
Caleb Rackliffe 8419fb21e0 Allow pre-V5 global limit on bytes in flight to revert to zero asynchronously in RateLimitingTest
patch by Caleb Rackliffe; reviewed by Brandon Williams for CASSANDRA-17927
2022-10-05 14:04:57 -05:00