Commit Graph

1252 Commits

Author SHA1 Message Date
Mick Semb Wever b73f034da1
Upgrade JNA to 5.6.0
Also remove remaining comments/doc referencing `-Dcassandra.boot_without_jna`

 patch by Adrain Cole, Mick Semb Wever; reviewed by Benjamin Lerer, Joey Lynch for CASSANDRA-16212

Co-authored-by: Adrian Cole <adrian.f.cole@gmail.com>
2020-11-16 09:36:45 +01:00
Mick Semb Wever f45b1edc91
Merge branch 'cassandra-3.11' into trunk 2020-11-04 13:03:42 +01:00
Mick Semb Wever 385434881f
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-11-04 12:48:42 +01:00
Mick Semb Wever b6ef9b22f2
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-11-04 12:42:20 +01:00
Mick Semb Wever 140048f5b7
Increment versions to 2.2.20, 3.0.24, 3.11.10, 4.0-beta4 2020-11-04 12:39:05 +01:00
Andrés de la Peña 095540d54a Merge branch 'cassandra-3.11' into trunk 2020-10-21 13:24:18 +01:00
Andrés de la Peña a2f59be943 Merge branch 'cassandra-3.0' into cassandra-3.11 2020-10-21 13:19:50 +01:00
Andrés de la Peña d44dbd91c1 Merge branch 'cassandra-2.2' into cassandra-3.0
# Conflicts:
#	CHANGES.txt
2020-10-21 13:19:13 +01:00
Angelo Polo 72941b9ec1 Package tools/bin scripts as executable
patch by Angelo Polo; reviewed by Andres de la Peña for CASSANDRA-16151
2020-10-21 13:09:51 +01:00
Bereng f6281619ae Nodetool ring testing
Patch by Berenguer Blasi, reviewed by brandonwilliams for
CASSANDRA-16200
2020-10-19 10:38:21 -05:00
Andrés de la Peña 83b41b6b69 Merge branch 'cassandra-3.11' into trunk
# Conflicts:
#	CHANGES.txt
#	src/java/org/apache/cassandra/db/filter/ColumnFilter.java
#	test/unit/org/apache/cassandra/db/filter/ColumnFilterTest.java
2020-10-19 15:31:20 +01:00
Brandon Williams fde6600a52 Revert "Nodetool ring testing"
This reverts commit c54da9e243.
2020-10-17 15:46:18 -05:00
Bereng c54da9e243 Nodetool ring testing
Patch by Berenguer Blasi, reviewed by brandonwilliams for
CASSANDRA-16200
2020-10-16 09:30:23 -05:00
Jordan West 06bc316c89 Merge branch 'cassandra-3.11' into trunk 2020-10-14 12:06:10 -07:00
Jordan West a6c222499b Merge branch 'cassandra-3.0' into cassandra-3.11 2020-10-14 12:04:14 -07:00
Jordan West 7b3a15dd9f Merge branch 'cassandra-2.2' into cassandra-3.0 2020-10-14 12:02:14 -07:00
Jordan West 9a40e8079b upgrade to dtest-api 0.0.6
patch by Jordan West; reviewed by David Capwell for CASSANDRA-16148
2020-10-14 11:59:44 -07:00
David Capwell 2ae1ec5dd2 Merge branch 'cassandra-3.11' into trunk 2020-10-12 11:07:44 -07:00
David Capwell 34dde962fc Merge branch 'cassandra-3.0' into cassandra-3.11 2020-10-12 11:06:32 -07:00
David Capwell 42989cee28 Merge branch 'cassandra-2.2' into cassandra-3.0 2020-10-12 11:05:28 -07:00
David Capwell 521a6e2aa9 Fixed a NullPointerException when calling nodetool enablethrift
patch by David Capwell; reviewed by Ekaterina Dimitrova, Jordan West, Yifan Cai for CASSANDRA-16127
2020-10-12 11:04:37 -07:00
Rahul Nandi e37f766403 Upgrade to snakeyaml >= 1.26 version for CVE-2017-18640 fix
patch by Rahul Nandi; reviewed by Alex Petrov, David Capwell for CASSANDRA-16150
2020-10-09 13:02:38 -07:00
David Capwell 16da961f2b Merge branch 'cassandra-3.11' into trunk 2020-10-07 14:35:18 -07:00
David Capwell 6c8c791f19 Merge branch 'cassandra-3.0' into cassandra-3.11 2020-10-07 14:34:04 -07:00
David Capwell 8d2556fd59 Merge branch 'cassandra-2.2' into cassandra-3.0 2020-10-07 14:33:02 -07:00
David Capwell 844d19d4e6 Add ant task to check license and fix all files missing a licence
patch by David Capwell; reviewed by Jordan West for CASSANDRA-16198
2020-10-07 14:32:12 -07:00
David Capwell 21a363becc Merge branch 'cassandra-3.11' into trunk 2020-10-05 19:06:58 -07:00
David Capwell b1efb8e418 Merge branch 'cassandra-3.0' into cassandra-3.11 2020-10-05 19:05:44 -07:00
David Capwell 5a2b5a4e5e Merge branch 'cassandra-2.2' into cassandra-3.0 2020-10-05 19:04:15 -07:00
Marcus Eriksson 4d173e0a3f Don't adjust nodeCount when setting node id topology in in-jvm dtests.
Make sure we don't throw any uncaught exceptions during in-jvm dtests.

patch by Marcus Eriksson; reviewed by Alex Petrov, David Capwell for CASSANDRA-16109,CASSANDRA-16101
2020-10-05 19:03:19 -07:00
Mick Semb Wever 936a81bf34
Merge branch 'cassandra-3.11' into trunk 2020-09-30 21:31:00 +02:00
Mick Semb Wever f5d5e72f61
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-09-30 21:12:08 +02:00
Mick Semb Wever 9ee74c9dc0
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-09-30 21:08:26 +02:00
Mick Semb Wever aaef142f48
In Jenkins propagate FAILURE from stages to pipeline, ssh artefacts to nightlies, and move ant's junitreport generation to a separate target "generate-test-report"
patch by Mick Semb Wever; reviewed by Berenguer Blasi for CASSANDRA-16128
2020-09-30 21:05:47 +02:00
Mick Semb Wever 3db64445f9
Cassandra website is building/including the wrong versioned nodetool docs
patch by Mick Semb Wever; reviewed by Anthony Grasso, Benjamin Lerer for CASSANDRA-16093
2020-09-24 14:18:54 +02:00
Alex Petrov 0dc5bd51f5 Changes required for Harry build
Patch by Alex Petrov; reviewed by Marcus Eriksson for CASSANDRA-16102
2020-09-18 23:39:10 +03:00
Mick Semb Wever fc87d3e0ab
Merge branch 'cassandra-3.11' into trunk 2020-08-31 21:02:14 +02:00
Mick Semb Wever ca37de06ef
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-08-31 21:00:57 +02:00
Mick Semb Wever 0eaed71d1d
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-08-31 20:59:29 +02:00
Mick Semb Wever 815de9982a
Merge branch 'cassandra-2.1' into cassandra-2.2 2020-08-31 20:57:58 +02:00
Mick Semb Wever 0271653f27
Increment versions after releases 2.1.22, 2.2.18, 3.0.22, 3.11.8, 4.0-beta2 2020-08-31 20:55:39 +02:00
Mick Semb Wever d49360bf27
Increment version to 2.1.22 2020-08-28 12:46:43 +02:00
Mick Semb Wever 382bcad07d
Backport CASSANDRA-14970 to 2.1 - New releases must supply SHA-256 and/or SHA-512 checksums
patch by Mick Semb Wever; reviewed by Benjamin Lerer for CASSANDRA-16081
2020-08-28 12:18:44 +02:00
David Capwell 0697489f74 Add test which validates that Message serializedSize(version) == serialize(out, version).length
patch by David Capwell; reviewed by Caleb Rackliffe, Jon Meredith for CASSANDRA-16064
2020-08-26 15:25:34 -07:00
David Capwell 528e3ad00b jvm-dtests crash on java 11
patch by David Capwell; reviewed by Alex Petrov, Jon Meredith for CASSANDRA-15981
2020-08-05 21:18:33 -07:00
Caleb Rackliffe 292650d968 Merge branch 'cassandra-3.11' into trunk 2020-07-30 14:10:48 +01:00
Caleb Rackliffe 2ef1f1c150 Merge branch 'cassandra-3.0' into cassandra-3.11 2020-07-30 13:27:53 +01:00
Caleb Rackliffe e5c3d08a14 Operational improvements and hardening for replica filtering protection
patch by Caleb Rackliffe; reviewed by Andrés de la Peña for CASSANDRA-15907
2020-07-30 12:53:52 +01:00
Mick Semb Wever d6a8afe64d
Increment to version 3.0.22 2020-07-29 16:37:23 +02:00
David Capwell 8c61214537 Merge branch 'cassandra-3.0' into cassandra-3.11 2020-07-24 18:50:47 -07:00