17afd5e6be
Merge branch 'cassandra-4.0' into cassandra-4.1
...
* cassandra-4.0:
Moved jflex from runtime to build dependencies
2023-07-13 15:33:12 +02:00
4f0865f769
Merge branch 'cassandra-3.11' into cassandra-4.0
...
* cassandra-3.11:
Moved jflex from runtime to build dependencies
2023-07-13 15:33:11 +02:00
32afc93b0d
Moved jflex from runtime to build dependencies
...
Patch by Jacek Lewandowski; reviewed by Berenguer Blasi, Mick Semb Wever and Stefan Miklosovic for CASSANDRA-18664
2023-07-13 15:33:10 +02:00
f038059e89
ninja-fix test*some targets need to pass a relative path to outfile
...
patch by Mick Semb Wever; reviewed by Stefan Miklosovic, Berenguer Blasi, Jacek Lewandowski for CASSANDRA-18133
2023-07-13 13:55:09 +02:00
f5df4b219e
Move build and test scripts in-tree, under .build/
...
See .build/README.md .Build and test scripts cover all CI activities in an CI agnostic manner. Scripts are found in non-docker and dockerised variants.
The non-docker scripts are found first under .build/ .These interact directly with ant, providing additional checks and environment setup. It is intended that what can be pushed down into the base ant build layer should be. The
debian and redhat build scripts are hidden under .build/docker because they are generally not usuable outside of their corresponding linux dists, and we don't want to encourage anything to the contrary. Bring the artifact/deb/rpm
build scripts (and associated docker images) from cassandra-builds repo to the .build directory. These packaging script for debian and redhat are now separated from the artifacts scripts. An additional build script check-code.sh
has been added that is solely responsible for all linter and code checks (includes owasp dependency checker). Only JDK11 and JDK17 are supported (as JDK8 is soon to be dropped). Scripts do not clean (or realclean) so that
scripts can be better pipelined, but `ant jar` was required to be added to circleci and ci-cassandra.a.o cqlsh-tests. Scripts can define a custom BUILD_DIR (build.dir) which can permit running parrallel builds off the same source
(though not all tests support this, or their support for it has atrophied). All build and test artifacts, results, and logs are found under build/ (or the BUILD_DIR). The build local venv and .ccm directories are now also
created under build (or BUILD_DIR). The test venv, logs and results are wiped each run. Use a separate mktemp directory each run, under /tmp (respect /tmp responsibility, and python fails when tmpdir is on a docker volume).
Don't set CASSANDRA_HOME when running python dtests (and fail-fast if `ant artifacts` was used to build instead of `ant jar`).
The docker scripts are found lower down under .build/docker/ .These scripts re-used the non-docker scripts inside containers. The docker images are versioned controlled in the same directory as dockerfiles, and tagged by their
md5sums. When running the docker scripts these docker images will, if not in the local registry, will first be attempted to be pulled from dockerhub and only then fallback to be built locally. This allows the dockerfiles to be
modified in existing patches and be run in existing CI as-is. Docker scripts timeout after one hour. virtualenv-clone is used, re-using the python versioned venvs in the image saves time over creating new ones each run. The inner-spliting of docker containers has been removed. It added a lot of complexity, for the most part duplicating the splitting concept, for little performance gain.
Ant target 'generate-unified-test-report' added, used for aggregating test reports and printing a summary.
patch by Mick Semb Wever; reviewed by Brandon Williams, Josh McKenzie, Maxim Muzafarov, Stefan Miklosovic for CASSANDRA-18133
2023-07-12 12:59:37 +02:00
ac25943876
Make `ant generate-idea-files` support the current JDK
...
ant generate-idea-files now support JDK 8, JDK 11 and JDK 17.
To add support of another JDK the java-jvmargs property must be set for the JDK in question (see how it's done in build.xml for Java 11 and 17)
Other minor, but notable changes are:
- test jvmargs are now added to idea run configurations
- .idea dir and project iml file are first removed and then recreated during `ant generate-idea-files`
patch by Jakub Zytka; reviewed by Mick Semb Wever, Štefan Miklošovič, Ekaterina Dimitrova for CASSANDRA-18467
2023-07-05 10:37:54 -04:00
41e62e6147
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-06-26 06:07:53 -05:00
776b33753b
Upgrade snappy to 1.1.10.1
...
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18608
2023-06-26 06:06:38 -05:00
9026f96234
Merge branch 'cassandra-4.1' into trunk
...
* cassandra-4.1:
Move checkstyle files into .build
2023-06-26 10:12:07 +02:00
f7b952387a
Move checkstyle files into .build
...
patch by Berenguer Blasi; reviewed by Stefan Miklosovic for CASSANDRA-18603
2023-06-26 10:08:17 +02:00
c32a848008
Run checkstyle only on j8
...
Patch by brandonwilliams; reviewed by edimitrova for CASSANDRA-18423
2023-06-05 05:39:28 -05:00
1adbea5a06
Extend maximum expiration date
...
patch by Berenguer Blasi; reviewed by Andrés de la Peña for CASSANDRA-14227
2023-06-05 07:18:34 +02:00
914484dfd8
Ninja fix missing IDEA sun.rmi.transport.tcp compiler export after CASSANDRA-18511
2023-06-02 13:50:21 -06:00
4bcadc6bfb
Merge branch 'cassandra-4.1' into trunk
2023-05-31 12:36:07 -06:00
208a71c008
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-05-31 12:12:50 -06:00
57293e8281
Merge branch 'cassandra-3.11' into cassandra-4.0
2023-05-31 12:04:29 -06:00
43ec184391
Add support for JMX in the in-jvm dtest framework
...
patch by Doug Rohrer; reviewed by Alex Petrov, Jon Meredith, Francisco Guerrero Hernandez for CASSANDRA-18511
2023-05-31 12:02:26 -06:00
2101ce947e
Merge branch 'cassandra-4.0' into cassandra-4.1
...
* cassandra-4.0:
Increment version to 4.0.11 and 4.1.3
2023-05-29 13:48:35 +02:00
71b79cfbe3
Increment version to 4.0.11 and 4.1.3
2023-05-29 13:38:07 +02:00
785e291900
Increment version to 3.0.30
2023-05-15 11:21:48 -05:00
ee5b601ce7
Increment version to 3.11.16
2023-05-05 05:57:31 -05:00
f2427a0c86
Increment version to 4.0.10
2023-04-14 11:20:04 +02:00
91f6a9aca8
Merge branch 'cassandra-4.1' into trunk
2023-04-13 10:29:14 -04:00
bb36090fa0
Set correctly keepBriefBrief property
...
patch by Ekaterina Dimitrova; reviewed by Andres de la Pena and Michael Semb Wever for CASSANDRA-18267
2023-04-13 10:09:43 -04:00
a8fa357bbc
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-04-06 23:32:14 +02:00
03be6d7926
update zstd-jni library to version 1.5.5
...
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-18429
2023-04-06 23:24:16 +02:00
d1d733bee5
Fix JDK17 startup issue after CASSANDRA-17199; temporary workaround, to be reverted after CASSANDRA-18239
...
Patch by Ekaterina Dimitrova; reviewed by Michael Semb Wever for CASSANDRA-18431
2023-04-05 20:53:42 -04:00
e98258a132
Upgrade checkstyle to 10.8.1 for j11 and 8.45.1 for j8
...
Patch by Maxim Muzafarov; reviewed by brandonwilliams and smiklosovic
for CASSANDRA-18262
2023-03-30 05:19:58 -05:00
3021c33cab
Increment version to 4.1.2
2023-03-21 07:00:29 -05:00
7ad746cc83
Revert "Switch checkstyle to j11."
...
This reverts commit 4e3447ae17
2023-03-13 11:59:37 -05:00
4e3447ae17
Switch checkstyle to j11.
...
Patch by brandonwilliams; reviewed by edimitrova for CASSANDRA-18262
2023-03-10 10:41:10 -06:00
f14fa978e4
Upgrade to Opcodes.ASM9
...
patch by Mick Semb Wever; reviewed by Ekaterina Dimitrova for CASSANDRA-17971
2023-03-09 10:21:39 +01:00
7ca806c60a
Change trunk from 4.2 to 5.0
...
– update MessagingService (remove the 4.1 version that was only a placeholder in test code bc serialisation test files were previously incorrectly serialising random UUIds for TimeUUIDs)
– update upgrade jvm-dtests
– remove older serialization binary files we are no longer testing against
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-17973
2023-03-07 11:03:38 +01:00
d1e3c781b5
Add JDK17 startup scripts
...
patch by Ekaterina Dimitrova; reviewed by Mick Semb Wever for CASSANDRA-18258
2023-02-27 12:06:44 -05:00
03996ecc6d
Merge branch 'cassandra-4.1' into trunk
2023-02-22 10:25:39 -06:00
474e778bcc
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-02-22 10:25:24 -06:00
1d532bce7b
Merge branch 'cassandra-3.11' into cassandra-4.0
2023-02-22 10:25:08 -06:00
a5b05cea5e
Merge branch 'cassandra-3.0' into cassandra-3.11
2023-02-22 10:24:22 -06:00
eb36a86a72
Removing trailing year from copyright.
...
Patch by brandonwilliams; reviewed by mck for CASSANDRA-18261
2023-02-22 10:23:47 -06:00
d7352209b2
ninja-fix: compile and use JdkProperties
...
patch by Mick Semb Wever; reviewed by Ekaterina Dimitrova for CASSANDRA-18179
2023-02-17 08:01:07 +01:00
2ea47b1b74
Merge branch 'cassandra-4.1' into trunk
2023-02-16 15:18:37 -07:00
b728a0011b
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-02-16 15:08:16 -07:00
3a4fff38b5
Ninja fix CASSANDRA-18242 - was not generating IDEA workspace for J11 correctly
2023-02-16 15:05:37 -07:00
a49efd8b44
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-02-15 13:39:00 +01:00
fcc16f5f2b
Update zstd-jni to version 1.5.4-1
...
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-18259
2023-02-15 13:37:01 +01:00
7b079503eb
Increment version to 4.0.9
2023-02-15 10:12:15 +01:00
86604f5038
Prepare for JDK17 experimental support
...
Removes the use of CASSANDRA_USE_JDK11 and introduces the build.xml properties `java.default` and `java.supported`.
patch by Mick Semb Wever; reviewed by Ekaterina Dimitrova for CASSANDRA-18179
2023-02-12 20:43:46 +01:00
67b483b5c8
Merge branch 'cassandra-4.1' into trunk
2023-02-01 15:35:20 +01:00
bede10f36c
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-02-01 15:28:50 +01:00
ba434b8231
Fix NPE in fqltool dump on null value
...
If fullquerylog is enabled and a prepared query executed with null value
binded, then fqltool dump is running into NPE. Checking value for null before
wrapping it.
patch by N V Harikrishna; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-18113
2023-02-01 14:46:44 +01:00
763793e89d
Merge branch 'cassandra-4.1' into trunk
2023-02-01 09:49:17 +01:00
dcc19cf865
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-02-01 09:47:12 +01:00
9bf128aaa3
Improve unit tests performance
...
- Don't flush schema on every schema update in unit tests
- Use unix command to delete test data
- Shorten teardown
- Stable processor count presented by JMX on Jenkins, CircleCI and local
Patch by <jacek-lewandowski>, reviewed by <michaelsembwever> and <josh-mckenzie> for CASSANDRA-17427
2023-02-01 09:40:50 +01:00
61a83b3cef
Merge branch 'cassandra-4.1' into trunk
2023-01-28 17:55:57 +01:00
b81d39306c
Merge branch 'cassandra-4.0' into cassandra-4.1
2023-01-28 17:11:29 +01:00
2a8e1972fd
Merge branch 'cassandra-3.11' into cassandra-4.0
2023-01-28 16:54:39 +01:00
8076f37c06
Merge branch 'cassandra-3.0' into cassandra-3.11
2023-01-28 16:33:36 +01:00
4c8e9097bd
Introduce check for names of test classes
...
patch by Stefan Miklosovic; reviewed by Berenguer Blasi and David Capwell for CASSANDRA-17943
2023-01-28 16:18:51 +01:00
b8a87abba4
Do not leak 2015 synthetic memtable Epoch
...
patch by Berenguer Blasi; reviewed by Caleb Rackliffe for CASSANDRA-18118
2023-01-12 08:15:19 +01:00
af5029d643
Increment versions to 4.1.1
2022-12-16 11:34:23 -08:00
4941b279bc
CEP-10: Simulator Java11 Support
...
patch by David Capwell; reviewed by Benedict Elliott Smith, Ekaterina Dimitrova for CASSANDRA-17178
2022-12-13 15:04:31 -08:00
676b3e4483
Increment version to 4.1.0
2022-11-22 15:41:18 +01:00
6be7fed242
Prepare for 4.1-rc1
2022-11-17 10:55:14 +01:00
4469f017c0
Merge branch 'cassandra-4.1' into trunk
...
* cassandra-4.1:
ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000)
2022-11-05 16:33:50 +01:00
2695bf7d38
Merge branch 'cassandra-4.0' into cassandra-4.1
...
* cassandra-4.0:
ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000)
2022-11-05 16:13:18 +01:00
17e6942775
Merge branch 'cassandra-3.11' into cassandra-4.0
...
* cassandra-3.11:
ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000)
2022-11-05 15:59:18 +01:00
f9b2cd6f3f
Merge branch 'cassandra-3.0' into cassandra-3.11
...
* cassandra-3.0:
ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000)
2022-11-05 15:51:14 +01:00
30a3266780
ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000)
2022-11-05 15:50:28 +01:00
f67f5613f4
Merge branch 'cassandra-4.1' into trunk
2022-11-04 16:27:38 +00:00
1cdb747b4c
Merge branch 'cassandra-4.0' into cassandra-4.1
2022-11-04 16:26:51 +00:00
5e705a8492
Merge branch 'cassandra-3.11' into cassandra-4.0
2022-11-04 16:26:08 +00:00
bdd6606486
Merge branch 'cassandra-3.0' into cassandra-3.11
2022-11-04 16:25:25 +00:00
95400649d8
Improve behaviour of the Ant flag to skip test building, no-build-test
...
patch by Andrés de la Peña; reviewed by Berenguer Blasi for CASSANDRA-18000
2022-11-04 16:24:38 +00:00
230fe8e647
Include Git SHA in --verbose flag for nodetool version
...
Patch by Abe Ratnofsky; review by Brandon Williams, Caleb Rackliffe, Michael Semb Wever and Stefan Miklosovic for CASSANDRA-17753
2022-10-25 21:28:29 +02:00
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
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
a3b4119b5a
Increment versions to 3.0.29, 3.11.15, 4.0.8
2022-10-23 23:18:45 +02:00
2f9ab68453
Update Byteman to 4.0.20 and Jacoco to 0.8.8
...
patch by Ekaterina Dimitrova; reviewed by Jacek Lewandowski and Michael Semb Wever for CASSANDRA-16413
2022-10-21 22:01:19 -04:00
7c55c73825
Adds a trie-based memtable implementation
...
patch by Branimir Lambov; reviewed by Jason Rutherglen, Jacek Lewandowski, Andres de la Peña and Caleb Rackliffe for CASSANDRA-17240
2022-10-21 12:55:56 +03:00
6f709ca0ec
Merge branch 'cassandra-4.1' into trunk
2022-10-20 14:02:45 -04:00
f13cdddcad
Merge branch 'cassandra-3.0' into cassandra-3.11
2022-10-18 16:47:08 +01:00
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
c4bccb000a
Increment version to 4.1-beta2
2022-10-05 17:14:37 -05:00
65c9875b39
increment version to 4.1-beta1
...
ref: https://lists.apache.org/thread/ho4r1lk2gsgs1z61ldzg64h84x3rbg4o
2022-09-26 23:33:01 +02:00
ff47de11d6
Merge branch 'cassandra-4.1' into trunk
2022-09-26 22:37:29 +02:00
5d3c747719
add checkstyle modules for checking redundant and unused imports in Java code
...
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-17876
Co-authored-by: Ling Mao <maoling@apache.org>
2022-09-26 21:41:15 +02:00
387c274a62
Merge branch 'cassandra-4.1' into trunk
2022-09-02 15:23:12 +02:00
a61edad15f
remove pure_sasl from the repository
...
This is follow-up for CASSANDRA-16456. The dependency
should be downloaded and put into the lib/ folder.
patch by Stefan Miklosovic; reviewed by Mick Semb Wever for CASSANDRA-16456
2022-09-02 15:21:52 +02:00
d82cb5703d
Increment version to 4.0.7
2022-08-25 17:49:58 +02:00
1e27ffc6ad
Remove dependency on Maven Ant Tasks
...
patch by Abe Ratnofsky; reviewed by David Capwell, Michael Semb Wever for CASSANDRA-17750
2022-08-24 22:40:26 -07:00
dbadd08585
Update ASM(9.1 to 9.3), Mockito(1.10.10 to 1.12.13) and ByteBuddy(3.2.4 to 4.7.0)
...
patch by Ekaterina Dimitrova; reviewed by Brandon Williams for CASSANDRA-17835
2022-08-24 12:12:18 -04:00
dd74bd4a03
Merge branch 'cassandra-4.1' into trunk
2022-08-18 05:57:59 -05:00
f579bddb75
Merge branch 'cassandra-4.0' into cassandra-4.1
2022-08-18 05:57:21 -05:00
9ec945acf9
Merge branch 'cassandra-3.11' into cassandra-4.0
2022-08-18 05:57:00 -05:00
6838fc552d
Merge branch 'cassandra-3.0' into cassandra-3.11
2022-08-18 05:55:53 -05:00
9e32c44455
Don't build javadoc with artifacts
...
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17712
2022-08-18 05:53:15 -05:00
3e0b94565a
Add support to generate a One-Shot heap dump on unhandled exceptions
...
Patch by Caleb Rackliffe; reviewed by Josh McKenzie, David Capwell, and Jon Meredith for CASSANDRA-17795
Co-authored-by: Caleb Rackliffe <calebrackliffe@gmail.com>
Co-authored-by: Josh McKenzie <jmckenzie@apache.org>
2022-08-15 10:48:29 -04:00
b94bf3f218
Merge branch 'cassandra-4.1' into trunk
2022-07-29 13:35:55 -04:00
fe28f482db
Fix sstable_preemptive_open_interval_in_mb disabled value - backward compatibility
...
patch by Ekaterina Dimitrova; reviewed by Andres de la Pena and Jon Meredith for CASSANDRA-17737
2022-07-29 13:26:31 -04:00
c5747547fa
Increment version to 4.0.6
2022-07-18 22:29:36 +02:00
315a1a72a6
Merge branch 'cassandra-4.1' into trunk
2022-07-14 17:20:52 +01:00
60f742c739
Followup to CASSANDRA-17530: Fix synchronisation of ClassTransformer, and make compilation deterministic
...
patch by Benedict; reviewed by Blake Eggleston for CASSANDRA-17530
2022-07-14 17:20:40 +01:00
dfd152cfa0
Merge branch 'cassandra-4.1' into trunk
2022-07-14 11:41:55 +02:00
14fc06a3ce
Raise test timeouts
...
patch by Berenguer Blasi; reviewed by Michael Semb Wever for CASSANDRA-17729
2022-07-14 11:39:09 +02:00
8468d33a31
Merge branch 'cassandra-4.1' into trunk
2022-07-12 12:29:12 +01:00
067121da63
Paxos v2 Linearizability Violation
...
patch by Benedict; reviewed by Blake Eggleston for CASSANDRA-17530
2022-07-12 12:28:59 +01:00
ab0a9b5f5c
Merge branch 'cassandra-4.1' into trunk
2022-07-06 17:44:11 -07:00
a250126f0f
Remove commons-lang dependency during build runtime
...
patch by Francisco Guerrero; reviewed by Dinesh Joshi, Yifan Cai for CASSANDRA-17724
2022-07-06 17:41:12 -07:00
92069ec093
testsome target doesn't work with wildcards
...
Patch by Bernardo Botella Corbi; reviewed by Brandon Williams and Berenguer Blasi for CASSANDRA-17083
2022-06-22 07:12:07 +02:00
1ca7a11dd0
Increment version to 4.1-alpha2
2022-05-27 23:07:34 +02:00
33b6a3d0f9
Prepare for 4.1-alpha1
...
ref: https://lists.apache.org/thread/hm2ljw4cpwvlb2hf79hpg78s74w39of0
2022-05-20 13:55:34 +02:00
756683c7cf
Prepare debian changelog for 4.0.4, bump version to 4.0.5
2022-05-14 01:29:41 +02:00
6ad666e3a8
Prepare debian changelog for 3.11.13, bump version to 3.11.14
2022-05-14 01:28:32 +02:00
f20f17b4a7
Prepare debian changelog for 3.0.27, bump version to 3.0.28
2022-05-14 01:26:46 +02:00
413f1aed27
Create release branch cassandra-4.1, increment trunk version to 4.2
2022-05-01 23:22:08 +02:00
e4e19e33fa
Add memtable API (CEP-11)
...
patch by Branimir Lambov; reviewed by Andrés de la Peña and Caleb Rackliffe for CASSANDRA-17034
2022-04-29 14:56:20 +03:00
bb3749f2bb
Merge branch 'cassandra-4.0' into trunk
2022-04-28 09:10:47 -05:00
eac7b1de35
Merge branch 'cassandra-3.11' into cassandra-4.0
2022-04-28 09:09:11 -05:00
4bb1a07b5b
Upgrade jackson-databind to 2.13.2.2
...
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17556
2022-04-28 09:05:02 -05:00
381c2a4fa8
add plugin support for CQLSH
...
patch by Brian Houser; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-16456
2022-04-27 12:35:04 +02:00
3409e5d9b3
Enhance SnakeYAML properties to be reusable outside of YAML parsing, support camel case conversion to snake case, and add support to ignore properties
...
patch by David Capwell; reviewed by Caleb Rackliffe, Stefan Miklosovic for CASSANDRA-17166
2022-04-22 20:17:45 -07:00
018c8e0d5e
Optimise BTree build, update and transform operations
...
Patch Benedict Elliott Smith; reviewed by Branimir Lambov and Benjamin Lerer for CASSANDRA-15510
2022-04-22 19:27:19 +02:00
7db3285e7b
Migrate track_warnings to more standard naming conventions and use latest configuration types rather than long
...
patch by David Capwell; reviewed by Andres de la Peña, Caleb Rackliffe for CASSANDRA-17560
2022-04-21 14:32:25 -07:00
6013f16de7
Merge branch 'cassandra-4.0' into trunk
2022-04-12 11:56:22 -07:00
1ebdc7e758
Merge branch 'cassandra-3.11' into cassandra-4.0
2022-04-12 11:48:08 -07:00
d7a9f41cf1
Merge branch 'cassandra-3.0' into cassandra-3.11
2022-04-12 11:46:43 -07:00
850336217b
Add support for vnodes in jvm-dtest
...
patch by David Capwell; reviewed by Alex Petrov, Josh McKenzie for CASSANDRA-17332
2022-04-12 11:45:31 -07:00
2fde9af74f
Clients using JMX are unable to handle non-standard java types but we leak this into our interfaces
...
patch by David Capwell; reviewed by Alex Petrov, Andres de la Peña for CASSANDRA-17527
2022-04-08 13:22:20 -07:00
f32d2b06de
Upgrade slf4j to 1.7.25
...
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17474
2022-03-31 07:21:25 -05:00
a6864cccd4
Upgrade jackson to 2.13.2
...
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17492
2022-03-29 07:15:09 -05:00
3a7e5f8ed8
Revert "Upgrade slf4j to 1.7.25"
...
This reverts commit 234bdc87a5
2022-03-25 15:00:43 -05:00
234bdc87a5
Upgrade slf4j to 1.7.25
...
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17474
2022-03-25 06:14:42 -05:00
94c2ad5304
Merge branch 'cassandra-4.0' into trunk
2022-03-22 07:32:13 -05:00
b465fec770
Upgrade jackson to 2.13.2
...
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17460
2022-03-22 07:28:17 -05:00
3b1ce69fc1
Merge branch 'cassandra-4.0' into trunk
2022-03-14 14:09:31 -05:00
d9bd03552d
Merge branch 'cassandra-3.11' into cassandra-4.0
2022-03-14 14:04:40 -05:00
541d769042
Merge branch 'cassandra-3.0' into cassandra-3.11
2022-03-14 14:04:26 -05:00
34f59904f5
Require at least ant >= 1.10
...
Patch by brandonwilliams; reviewed by smiklosovic and paulo for
CASSANDRA-17428
2022-03-14 14:02:29 -05:00
7b91e4cc18
Remove all usages of junit.framework and ban them via Checkstyle
...
patch by Caleb Rackliffe; reviewed by Marcus Eriksson for CASSANDRA-17316
Co-authored-by: Marcus Eriksson <marcuse@apache.org>
2022-03-11 12:32:04 -06:00
d2923275e3
CEP-14: Paxos Improvements
...
This work encompasses a range of improvements to Paxos, summarised as:
- The introduction of Paxos Repair for ensuring consistency during range movements
- The reduction of network round-trips by a factor of 2x for reads and writes
patch by Benedict Elliott Smith and Blake Eggleston; reviewed by Alex Petrov, Aleksey Yeschenko and Sam Tunnicliffe for CASSANDRA-17164
2022-03-10 16:30:12 +00:00
5a0d6154d1
[CASSANDRA-17176] Introduce TimeUUID
...
patch by Benedict; reviewed by Blake Eggleston for CASSANDRA-17176
2022-03-10 16:30:12 +00:00
a8bbd22d37
Fix ignored streaming encryption settings in sstableloader
...
Patch by Dmitry Potepalov; reviewed by bereng and brandonwilliams for
CASSANDRA-17367
Encryption settings were silently lost in BulkLoadConnectionFactory.
Forced the bulk loader test to do some actual streaming besides just
handshaking on the native port, the test does not pass without the
change in BulkLoadConnectionFactory.
2022-03-02 08:00:40 -06:00
0e249fd15e
Fix ignored streaming encryption settings in sstableloader
...
Patch by Dmitry Potepalov; reviewed by bereng and brandonwilliams for
CASSANDRA-17367
Encryption settings were silently lost in BulkLoadConnectionFactory.
Forced the bulk loader test to do some actual streaming besides just
handshaking on the native port, the test does not pass without the
change in BulkLoadConnectionFactory.
2022-03-02 07:45:13 -06:00
894d33ce40
Increment version to 4.0.4
2022-02-17 09:26:44 +01:00
81922c5a7b
Intoduce Harry to the tree
...
Patch by Alex Petrov; reviewed by Caleb Rackliffe and Abe Ratnofsky for CASSANDRA-16262.
2022-02-16 09:00:36 +01:00
d0f4b42956
Increment version to 4.0.3
2022-02-11 11:08:24 +01:00
25828cb9b1
Increment version to 3.0.27
2022-02-11 11:06:48 +01:00
1e015ed2a2
Increment version to 3.11.13
2022-02-11 11:06:25 +01:00
6d7b0a1079
Fix classpath file creation for eclipse
...
Patch by Yash Ladha; reviewed by Benjamin Lerer and Berenguer Blasi for CASSANDRA-17294
When building the eclipse file for development, `.classpath` file was
not correctly generated as it was not getting closed. Also there were
missing third-party libs that were essential for development.
This commit fixes the generation of classpath for
`generate-eclipse-files` command.
2022-02-09 15:08:15 +01:00
d543dae2cd
Fix restarting a node when other nodes are down in dtests
...
patch by Jacek Lewandowski; reviewed by Michael Semb Wever for CASSANDRA-17214
2022-01-26 13:35:47 +01:00
0a6be7e412
Substitute ant script and scriptdef with custom ant tasks
...
patch by Ekaterina Dimitrova; reviewed by Michaem Semb Wever for CASSANDRA-17224
2022-01-24 10:12:51 -05:00
e6b589b833
Merge branch 'cassandra-4.0' into trunk
2022-01-23 13:07:00 +01:00
e769d0d6d6
Merge branch 'cassandra-3.11' into cassandra-4.0
2022-01-23 13:03:54 +01:00
9c6efe1222
Bump copyright to 2009-2022
2022-01-23 13:01:58 +01:00
add1d1d752
Merge branch 'cassandra-4.0' into trunk
2022-01-20 09:50:45 -06:00
cf9091a12c
Merge branch 'cassandra-3.11' into cassandra-4.0
2022-01-20 09:49:36 -06:00
7e68448235
Merge branch 'cassandra-3.0' into cassandra-3.11
2022-01-20 09:48:13 -06:00
28004d9c60
Upgrade logback to 1.2.9
...
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17204
includes backported test changes from CASSANDRA-14183
2022-01-20 09:47:11 -06:00
2043cb9fb6
Upgrade Snappy and JNA version to support Apple M1
...
Patch-By Yuqi Gu; Reviewed by Dinesh Joshi and Yifan Cai for CASSANDRA-17040
2022-01-07 11:02:48 -08:00
54aee87c56
Merge branch 'cassandra-4.0' into trunk
2022-01-05 23:11:36 +01:00
0aad2e9e86
Merge branch 'cassandra-3.11' into cassandra-4.0
2022-01-05 23:00:27 +01:00
05b0eaecad
Migrate documentation to AsciiDoc
...
This commit sets up a new documentation structure and format:
* The directory struture changes from a Sphinx project to an Antora module layout.
* The formatting of the content changes from reStructuredText to AsciiDoc.
The documentation must now be built and published with Antora. Initially only from the cassandra-website repository.
This change was done to make maintaining versioned website documentation easier. As Antora is designed to generate versioned documentation.
The old directory structure was:
<ROOT>
- doc/
- cql3/
- CQL.css
- CQL.textile
- source/
- _static/
- _templates/
- _theme/
- _util/
- <other directory sections>/
- conf.py
- index.rst
- <other *.rst pages>
- make.bat
- Makefile
- README.md
- SASI.md
- <*.spec files>
- <generation scripts>
The new directory structure organises the documentation into modules:
<ROOT>
- doc/
- cql3
- modules/
- cassandra/
- assets/
- examples/
- pages/
- partials/
- nav.adoc
- ROOT/
- pages/
- nav.adoc
- scripts/
- antora.yaml
- README.md
- SASI.md
patch by Lorina Poland, Anthony Grasso; reviewed by Anthony Grasso, Mick Semb Wever for CASSANDRA-16763
Co-authored-by: Anthony Grasso <anthony@thelastpickle.com>
2022-01-05 22:03:02 +01:00
b83d722b99
Merge branch 'cassandra-4.0' into trunk
2022-01-03 20:34:25 -05:00
3ceaed125c
Update ant-junit to version 1.10.12
...
patch by Ekaterina Dimitrova; reviewed by Michael Semb Wever for CASSANDRA-17218
2022-01-03 20:26:52 -05:00
1911a887e8
Fix slow keycache load which blocks startup for tables with many sstables.
...
Patch by Venkata Harikrishna Nukala; reviewed by Marcus Eriksson and Joseph Lynch for CASSANDRA-14898
2021-12-09 10:14:16 -05:00
209c35aa62
[CEP-10] Phase 4: Cluster and Code Simulation
...
patch by Benedict; reviewed by Sam Tunnicliffe for CASSANDRA-17008
Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
Co-authored-by: Sam Tunnicliffe <samt@apache.org>
Co-authored-by: Alex Petrov <oleksandr.petrov@gmail.com>
2021-11-30 16:05:54 +00:00
a6cfd64bee
Merge branch 'cassandra-4.0' into trunk
2021-11-17 10:57:51 +01:00
3f2066d150
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-11-17 10:42:16 +01:00
cd73c14cec
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-11-17 10:31:18 +01:00
44d81b5d09
Create property for local repository
...
patch by Sumanth Pasupuleti; reviewed by Mick Semb Wever for CASSANDRA-16917
2021-11-15 16:20:28 +01:00
cedde3d991
Merge branch 'cassandra-4.0' into trunk
2021-11-10 11:13:52 +00:00
07b908c78c
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-11-10 11:12:29 +00:00
bfe4a90852
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-11-10 11:11:43 +00:00
e4d96721bf
Merge branch 'cassandra-2.2' into cassandra-3.0
2021-11-10 11:10:04 +00:00
5c7603c2ae
Upgrade to snakeyaml 1.26
...
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17028
2021-10-15 10:06:57 -05:00
5b82447098
[CASSANDRA-17013] CEP-10 Phase 1: in-jvm-dtest-api changes and version bump
2021-10-07 14:30:20 +01:00
be1f050bc8
[CASSANDRA-16925] CEP-10 Phase 1: Mockable Task Execution
...
Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
Co-authored-by: Sam Tunnicliffe <samt@apache.org>
2021-10-07 14:27:52 +01:00
bcdb575fd3
Merge branch 'cassandra-4.0' into trunk
2021-10-01 15:20:32 +01:00
36266ce257
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-10-01 15:19:35 +01:00
2614f7eeb4
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-10-01 15:18:40 +01:00
0c4653110d
Make -Dtest.methods consistently optional in all Ant test targets
...
patch by Andrés de la Peña; reviewed by Berenguer Blasi for CASSANDRA-17014
2021-10-01 15:17:07 +01:00
3cc59017a4
Merge branch 'cassandra-4.0' into trunk
2021-09-30 21:37:08 +02:00
59f5e57faf
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-09-30 21:34:16 +02:00
9bf14a6011
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-09-30 21:32:45 +02:00
225a4c8faf
add OWASP dependency check to Ant build
...
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-14612
2021-09-30 21:30:36 +02:00
15a2fe00fc
[CASSANDRA-16923] CEP-10 Phase 1: Mockable System Clock
...
Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
Co-authored-by: Aleksey Yeschenko <aleksey@apache.org>
Co-authored-by: Sam Tunnicliffe <samt@apache.org>
2021-09-29 19:38:34 +01:00
e0777ff5ab
Merge branch 'cassandra-4.0' into trunk
2021-09-29 08:07:32 +02:00
e365908ee4
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-09-29 07:57:05 +02:00
095475b9cc
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-09-29 07:49:10 +02:00
6b16b67cd4
update jBCrypt dependency to version 0.4
...
patch by Stefan Miklosovic; reviewed by Dinesh Joshi for CASSANDRA-9384
2021-09-29 07:39:29 +02:00
c7526f943f
Add soft/hard limits to local reads to protect against reading too much data in a single query
...
patch by David Capwell; reviewed by Caleb Rackliffe and Marcus Eriksson for CASSANDRA-16896
2021-09-28 12:49:12 -05:00
7c3935ced3
Merge branch 'cassandra-4.0' into trunk
2021-09-17 17:29:45 -04:00
14af149ed5
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-09-17 17:26:41 -04:00
e4d2802276
Update Jackson from 2.9.10 to 2.12.5
...
patch by Tatu Saloranta; reviewed by Ekaterina Dimitrova, Brandon Williams, Michael Semb Wever for CASSANDRA-16851
2021-09-17 17:25:25 -04:00
7faff38826
Upgrade Caffeiene to 2.9.2
...
Patch by Aleksei Zotov; reviewed by brandonwilliams and mck for
CASSANDRA-15153
2021-09-17 08:51:30 -05:00
dd3d83a819
Upgrade Caffeine to 2.5.6
...
Patch by Aleksei Zotov; reviewed by brandonwilliams and mck for
CASSANDRA-15153
2021-09-17 08:48:35 -05:00
18b2100bc4
Merge branch 'cassandra-4.0' into trunk
2021-09-11 00:38:50 +02:00
05e7cc1553
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-09-11 00:31:25 +02:00
32194ec8d0
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-09-11 00:20:42 +02:00
b6f0864982
Add semver4j to the default shared packages in the jvm dtests
...
(Upgrade to dtest-api-0.0.9)
patch by Mick Semb Wever; reviewed by Alex Petrov for CASSANDRA-16803
2021-09-10 23:55:30 +02:00
9a34ecd4ad
Increment version to 4.0.2
2021-09-07 16:50:51 +01:00
b92620c387
Merge branch 'cassandra-4.0' into trunk
2021-08-30 21:38:40 +02:00
a6ea52118c
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-08-30 21:20:57 +02:00
b0cdaec5ae
Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies
...
patch by Tatu Saloranta; reviewed by Mick Semb Wever for CASSANDRA-16854
2021-08-30 21:09:17 +02:00
1b5545beef
Merge branch 'cassandra-4.0' into trunk
2021-08-26 15:09:04 -07:00
42025fd73a
Bump zstd-jni version to 1.5.0-4
...
patch by Yifan Cai; reviewed by Dinesh Joshi for CASSANDRA-16884
2021-08-26 15:07:53 -07:00
ad24942481
Add TTL support to nodetool snapshots
...
Patch by Abi Palagashvili; Reviewed by Paulo Motta and Stefan Miklosovic for CASSANDRA-16789
Co-authored-by: Paulo Motta <pauloricardomg@gmail.com>
Co-authored-by: Stefan Miklosovic <smiklosovic@apache.org>
Closes #1046
2021-08-26 14:57:58 -03:00
4b3f07fc74
allow blocking IPs from updating metrics about traffic
...
patch by David Capwell; reviewed by Benjamin Lerer, Caleb Rackliffe, Jon Meredith for CASSANDRA-16859
2021-08-20 17:24:16 -07:00
ca6bb2af02
Resolve ant-junit dependency issue CASSANDRA-16827
...
patch by Ekaterina Dimitrova; reviewed by Michael Semb Wever for CASSANDRA-16827
2021-08-10 10:49:09 -04:00
760c7e88b8
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-07-28 14:39:46 -05:00
8e9e4aed99
Incrememnt version
2021-07-28 14:39:11 -05:00
3e54ed76b2
Don't put apidocs (javadoc) into the binary artifact
...
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-15561
2021-07-25 11:37:33 -05:00
7fafda8e90
Don't fork jvms in the build
...
On build machines with less than 1GB ram, use ANT_OPTS="-Xmx512m"
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16583
2021-07-25 11:37:33 -05:00
b2cfe2e5d7
Fix warning about multiple versions of ant detected when running ant test patch by Ekaterina Dimitrova; reviewed by Brandon Williams and Mick Semb Wever for CASSANDRA-16571
2021-07-25 11:37:33 -05:00
fd7732389a
Update IDE, Eclipse and NetBeans, classpaths for tests
...
patch by Mick Semb Wever, Berenguer Blasi; reviewd by Ekaterina Dimitrova, Benjamin Lerer for CASSANDRA-16560
2021-07-25 11:37:33 -05:00
c44dfab9b5
Add JStackJUnitTask to avoid downloading the jar
...
Patch by marcuse; reviewed by Brandon Williams, David Capwell, Michael Semb Wever for CASSANDRA-16570
2021-07-25 11:37:32 -05:00
e6950518d1
Offline build mode
...
When all dependencies are already in the local `~/.m2/repository/` we should not be needing an internet connection. ("Offline" mode should be automatic)
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16559
2021-07-25 11:37:32 -05:00
2fdf1d2762
Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks
...
- This removes lib/ from version control.
- The generated pom files are now the source of truth to the project's depdendencies, and the lib/ folder re-created during the build from compile scope dependencies excluding provided and system scopes. Project dependencies are first downloaded to the maven local repository at `~/.m2/repository`.
- Maven is now required to be installed to build, that is the `mvn` command needs to be found in the path.
- The new resolver-ant-tasks targets have been encapsulated into the `build/build-resolver.xml` ant file.
- Most classpaths in build.xml are replaced with resolver:resolve definitions.
- The build-deps-pom generated pom file is now only used for declaring test dependencies.
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16557
2021-07-25 11:37:32 -05:00
e243026c85
Don't put apidocs (javadoc) into the binary artifact
...
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-15561
2021-07-25 11:35:45 -05:00
3259d6de37
Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks
...
- This removes lib/ from version control.
- The generated pom files are now the source of truth to the project's depdendencies, and the lib/ folder re-created during the build from compile scope dependencies excluding provided and system scopes. Project dependencies are first downloaded to the maven local repository at `~/.m2/repository`.
- Maven is now required to be installed to build, that is the `mvn` command needs to be found in the path.
- The new resolver-ant-tasks targets have been encapsulated into the `build/build-resolver.xml` ant file.
- Most classpaths in build.xml are replaced with resolver:resolve definitions.
- The build-deps-pom generated pom file is now only used for declaring test dependencies.
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16557
2021-07-25 11:35:45 -05:00
f9a220c110
Merge branch 'cassandra-4.0' into trunk
2021-07-12 22:40:35 +02:00
4dcf7d9ebd
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-07-12 22:34:46 +02:00
0c1e1ccfad
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-07-12 22:22:42 +02:00
0a84dda36a
Merge branch 'cassandra-2.2' into cassandra-3.0
2021-07-12 22:16:36 +02:00
b3f9921881
Introduce SemVer4j for version representation, parsing and handling. And correct supported upgrade paths. Add v4X to Java DTests (after cassandra-4.0 branch was created)
...
Change upgrades from testing only a single path, to testing all upgrade paths that are defined as supported within the specified from-to range.
Change all upgrades to v40 and v4X to be open ended (i.e. implicit CURRENT version).
patch by Mick Semb Wever; reviewed by Alex Petrov for CASSANDRA-16649
2021-07-12 22:09:40 +02:00
80fd439be1
Merge branch 'cassandra-4.0.0' into cassandra-4.0
2021-07-08 23:44:06 +02:00
09a387bd3d
Change version from 4.0-rc3 to 4.0.0
2021-07-08 23:28:37 +02:00
65b42304f5
ninja-fix: return cassandra-4.0's version to 4.0-rc2 (4.0.x version numbers are not yet supported: CASSANDRA-16781 and CASSANDRA-16649)
2021-07-02 14:57:41 +02:00
c79124d5e6
Merge branch 'cassandra-4.0.0' into cassandra-4.0
2021-06-30 21:55:25 +02:00
d13bef96fd
Increment version to 4.0-rc3
2021-06-30 21:53:31 +02:00
d7aaaa5001
Merge branch 'cassandra-4.0' into trunk
2021-06-23 13:12:03 -07:00
26e21bb576
Upgrade lz4-java to 1.8.0 to add RH6 support back
...
patch by David Capwell; reviewed by Brandon Williams for CASSANDRA-16753
2021-06-23 13:04:26 -07:00
72dca97af9
Merge branch 'cassandra-4.0' into trunk
2021-06-17 12:11:59 +02:00
bd1ffa7617
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-06-17 12:11:01 +02:00
b857aa12bf
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-06-17 11:42:18 +02:00
d54eff3a4a
Remove full project building from the generate-idea-files ant target
...
- that target was unnecessarily building the whole project which made it problematic to update the project while merging/rebasing if conflicts in the code were failing the compilation
- updated system properties for default run test task in Intellij to match those when running tests from Ant
- fix test-memory target
patch by Jacek Lewandowski; reviewed by Mick Semb Wever for CASSANDRA-16697
2021-06-17 11:25:58 +02:00
a978754691
Merge branch 'cassandra-4.0' into trunk
2021-06-12 11:55:19 +02:00
d93e43ed9b
Cleanup dependencies scopes
...
patch by Angelo Polo; reviewed by Mick Semb Wever for CASSANDRA-16704
Co-authored-by: Angelo Polo <language.devel@gmail.com>
2021-06-12 11:51:11 +02:00
855dcad75b
Merge branch 'cassandra-4.0' into trunk
2021-05-26 13:57:40 -05:00
f4ab8cce1e
Keep python driver in artifacts.
...
Patch by brandonwilliams; approved by mck for CASSANDRA-16700
2021-05-26 13:56:48 -05:00
f637198484
Merge branch 'cassandra-4.0' into trunk
2021-05-12 11:32:04 +01:00
98b449f38a
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-05-12 11:28:55 +01:00
1e42c105ce
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-05-12 11:25:57 +01:00
a01cbfdce5
Add CircleCI jobs to repeat specific tests n times
...
patch by Andrés de la Peña; reviewed by Ekaterina Dimitrova and Berenguer Blasi for CASSANDRA-16625
2021-05-12 11:21:41 +01:00
d2b57fe463
Create release branch cassandra-4.0, increment trunk version to 4.1
2021-05-01 12:13:59 +02:00
438a9c835a
Add a microbenchmark for checksums
...
Patch by Alexey Zotov; reviewed by brandonwilliams for CASSANDRA-16360
2021-04-30 09:05:41 -05:00
10a1d65eb0
Fix compression test runs
...
Ensure the specified commitlog_compression_xxx.yaml file is appended to the used cassandra.compressed.yaml, according to the selected algorithm as defined by `test.compression.algo` the property. By default we use the default LZ4. An unknown compression algo with fail.
patch by Jacek Lewandowski; reviewed by Mick Semb Wever for CASSANDRA-16575
2021-04-28 10:43:46 +02:00
36a0f11221
Merge branch 'cassandra-3.11' into trunk
2021-04-27 12:01:30 +01:00
9449cd3d6e
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-04-27 11:57:00 +01:00
4763d5625a
Merge branch 'cassandra-2.2' into cassandra-3.0
2021-04-27 11:56:07 +01:00
Jacek Lewandowski