Commit Graph

1590 Commits

Author SHA1 Message Date
Stefan Miklosovic 8c4e21eeca
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-03-19 12:26:29 +01:00
Stefan Miklosovic a16333387c
Update zstd-jni to 1.5.7-2
patch by Stefan Miklosovic; reviewed by Dmitry Konstantinov for CASSANDRA-20453
2025-03-19 12:24:33 +01:00
Stefan Miklosovic 16bca9d343
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-03-06 14:23:11 +01:00
Stefan Miklosovic ef354d0d5e
Update Zstd library to 1.5.7-1
patch by Stefan Miklosovic; reviewed by Yifan Cai for CASSANDRA-20367
2025-03-06 14:19:01 +01:00
Stefan Miklosovic 8ca0af32f3
Merge branch 'cassandra-3.11' into cassandra-4.0 2025-02-07 12:45:03 +01:00
Stefan Miklosovic ed3f1af723
Merge branch 'cassandra-3.0' into cassandra-3.11 2025-02-07 12:43:10 +01:00
Stefan Miklosovic f340514bbe
Increment version 2025-02-07 12:40:54 +01:00
Stefan Miklosovic 9f5fc9d892
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-02-04 09:59:23 +01:00
Stefan Miklosovic 8e28dd0c17
Merge branch 'cassandra-3.11' into cassandra-4.0 2025-02-04 09:54:09 +01:00
Stefan Miklosovic 82e2c7d991
Merge branch 'cassandra-3.0' into cassandra-3.11 2025-02-04 09:50:02 +01:00
Stefan Miklosovic 7c147ef80e
Increment version 2025-02-04 09:46:26 +01:00
Brandon Williams bdfb3fb9d6 increment version to 4.0.16 2024-11-18 09:01:15 -06:00
Mick Semb Wever ea801625f6
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  increment version to 4.0.15 and 4.1.8
2024-09-26 22:58:35 +02:00
Mick Semb Wever bf8870f763
increment version to 4.0.15 and 4.1.8 2024-09-26 22:55:52 +02:00
Mick Semb Wever 50b2a29e60
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  ninja-fix build.xml version to 4.0.14
2024-09-18 10:31:16 +02:00
Mick Semb Wever 2699bc8dae
ninja-fix build.xml version to 4.0.14 2024-09-18 10:29:51 +02:00
Brandon Williams 5c3efdd35d Increment version 2024-05-20 09:39:22 -05:00
Jacek Lewandowski 445ae1a4b1 Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Fix few types issues and implement types compatibility tests
2024-04-18 12:33:54 +02:00
Jacek Lewandowski f92998190c Fix few types issues and implement types compatibility tests
Patch by Jacek Lewandowski; reviewed by Stefan Miklosovic for CASSANDRA-19479
2024-04-18 12:33:52 +02:00
Brandon Williams 2856a34636 Increment version 2024-04-16 13:26:59 -05:00
Brandon Williams 44f472d742 Increment version 2024-04-15 11:24:55 -05:00
Stefan Miklosovic 95fcefede2
Merge branch 'cassandra-4.0' into cassandra-4.1 2024-02-23 14:51:06 +01:00
Stefan Miklosovic 5430e69e77
Merge branch 'cassandra-3.11' into cassandra-4.0 2024-02-23 14:49:06 +01:00
Stefan Miklosovic af5733124d
Merge branch 'cassandra-3.0' into cassandra-3.11 2024-02-23 14:48:02 +01:00
Jack Green 98eea87aa5
Fix SCM URL links
patch by Jack Green; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-19422
2024-02-23 14:43:41 +01:00
Stefan Miklosovic a9a7dd0caf
increment version to 4.1.5 2024-02-14 21:18:44 +01:00
Stefan Miklosovic 2a7c64027d
increment version to 4.0.13 2024-01-23 18:40:10 +01:00
Jacek Lewandowski 481d2fd51d Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Updated the OWASP plugin to 9.0.5 and refactored dependency checks
2023-12-20 12:59:54 +01:00
Jacek Lewandowski 891f1119a0 Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Updated the OWASP plugin to 9.0.5 and refactored dependency checks
2023-12-20 12:59:53 +01:00
Jacek Lewandowski 09c46750f6 Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Updated the OWASP plugin to 9.0.5 and refactored dependency checks
2023-12-20 12:59:52 +01:00
Jacek Lewandowski 4c3b96e4cd Updated the OWASP plugin to 9.0.5 and refactored dependency checks
Configured OWASP database to use caching and NVD key. Properties can be
configured in ~/.ant/build.properties and define both the key and
the storage location

Patch by Jacek Lewandowski; reviewed by Maxim Muzafarov, Stefan Miklosovic for CASSANDRA-19146
2023-12-20 12:59:51 +01:00
Jacek Lewandowski 4059faf5b9 Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Fix repeated tests on CircleCI and long-testsome/burn-testsome targets
2023-12-01 19:40:45 +01:00
Jacek Lewandowski e1b0b44f9e Fix repeated tests on CircleCI and long-testsome/burn-testsome targets
Patch by Jacek Lewandowski; reviewed by Berenguer Blasi for CASSANDRA-19086
2023-12-01 19:40:44 +01:00
Stefan Miklosovic ea6461b870
Merge branch 'cassandra-4.0' into cassandra-4.1 2023-10-10 10:04:42 +02:00
Stefan Miklosovic b57c13603a
Remove byteman-related files from production sources
This patch also removes compress-lzf library (leftover from CASSANDRA-12229)
as well as it makes byte-buddy dependencies to be test scoped.

patch by Stefan Miklosovic; reviewed by Michael Semb Wever for CASSANDRA-18877
2023-10-10 09:51:11 +02:00
Ekaterina Dimitrova 486acc68f1 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-10-03 10:50:41 -04:00
Ekaterina Dimitrova 4eeaf6a6ee Update hdrhistogram to 2.1.12
patch by Ekaterina Dimitrova; reviewed by Brandon Williams and Tobias Lindaaker for CASSANDRA-18893
2023-10-03 10:39:22 -04:00
Stefan Miklosovic 27fe757636
Merge branch 'cassandra-4.0' into cassandra-4.1 2023-09-27 20:57:23 +02:00
Stefan Miklosovic b039f72e6b
Merge branch 'cassandra-3.11' into cassandra-4.0 2023-09-27 20:54:09 +02:00
Stefan Miklosovic 058621a446
Merge branch 'cassandra-3.0' into cassandra-3.11 2023-09-27 20:51:35 +02:00
Maxim Muzafarov dc7234134c
Upgrade snappy-java to 1.1.10.4
patch by Maxim Muzafarov; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-18878
2023-09-27 20:49:09 +02:00
Jacek Lewandowski 2747dbf091 Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  JMH improvements - faster build and async profiler
2023-09-25 12:39:38 +02:00
Jacek Lewandowski 3658ba58c7 JMH improvements - faster build and async profiler
- Don't create uber jar for microbenchmarks
- Add async profiler to jmh tests
- Benchmark classes names validation
- Add jmh.args property to make it possible passing extra args to JMH
- Add missing test/anttasks to idea configuration

Patch by Jacek Lewandowski; reviewed by Branimir Lambov, Maxim Muzafarov, Stefan Miklosovic for CASSANDRA-18871
2023-09-25 12:39:36 +02: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
Jon Meredith ac3b356063 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-08-24 16:43:53 -06:00
Jon Meredith 4034fbb6dd Merge branch 'cassandra-3.11' into cassandra-4.0 2023-08-24 16:34:44 -06:00
Doug Rohrer c6d7d070c5 IsolatedJMX should not release all TCPEndpoints on instance shutdown
patch by Doug Rohrer; reviewed by Jon Meredith, Stefan Miklosovic for CASSANDRA-18725
2023-08-24 16:32:28 -06:00
Stefan Miklosovic 8ddfbb6a3c
Increase version to 3.11.17 2023-08-18 18:08:32 +02:00
Brandon Williams f4ee77ceba Merge branch 'cassandra-4.0' into cassandra-4.1 2023-08-18 10:12:32 -05:00
Brandon Williams ba50ec9cd9 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-08-18 10:10:11 -05:00