Commit Graph

24122 Commits

Author SHA1 Message Date
Ekaterina Dimitrova eb0f13af8d Merge branch 'cassandra-3.0' into cassandra-3.11 2021-04-19 13:51:18 -04:00
Ekaterina Dimitrova 5c6ae40404 Ninja fix, add header to the Circle LOWRES and HIGHRES config files 2021-04-19 13:34:22 -04:00
Mick Semb Wever 2ec96ae669
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-04-19 17:34:05 +02:00
Mick Semb Wever 50a97a0d76
Merge branch 'cassandra-2.2' into cassandra-3.0 2021-04-19 17:29:00 +02:00
Mick Semb Wever 53b0661cbb
Fix rat checking for files with missing license headers
patch by Mick Semb Wever; reviewed by Brandon Williams, Ekaterina Dimitrova for CASSANDRA-16558
2021-04-19 17:18:26 +02:00
Brandon Williams 2d474c86a3 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-04-16 08:23:10 -05:00
Brandon Williams 7a6a7099dc Merge branch 'cassandra-2.2' into cassandra-3.0 2021-04-16 08:22:58 -05:00
Vicente Jimenez Aguilar 99b6095ecc Fix init script for debian Buster
Patch by Vicente Jimenez Aguilar, reviewed by brandonwilliams for
CASSANDRA-15770
2021-04-16 08:14:38 -05:00
Mick Semb Wever cca5ce56ac
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-04-16 00:43:03 +02:00
Mick Semb Wever 5f1b538ef5
Merge branch 'cassandra-2.2' into cassandra-3.0 2021-04-16 00:41:27 +02:00
Mick Semb Wever c52f50f046
Restore running each test class in its own separate jvm and cassandra directory
(Remove test parallelism from ant build.xml)

 patch by Mick Semb Wever; reviewed by Yifan Cai, David Capwell for CASSANDRA-16595
2021-04-16 00:38:22 +02:00
Mick Semb Wever 5b93a87a6f
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-04-15 13:07:39 +02:00
Mick Semb Wever 2a6059ef4a
Merge branch 'cassandra-2.2' into cassandra-3.0 2021-04-15 13:04:17 +02:00
Mick Semb Wever 1185593907
Remove test parallelism from ant build.xml
patch by Mick Semb Wever; reviewed by Berenguer Blasi, Yifan Cai for CASSANDRA-16595
2021-04-15 12:55:31 +02:00
Brandon Williams c7293183c3 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-04-13 12:03:00 -05:00
Brandon Williams db6e70442d Don't wait for migrations from removed nodes, mention flag to skip
Patch by brandonwilliams; reviewed by Adam Holmberg, adelapena and
bdeggleston for CASSANDRA-16577
2021-04-13 07:41:47 -05:00
Brian Houser 7152d40bb3 Add autocomplete, errors for provide_overlapping_tombstones
Patch by Brian Houser; reviewed by marcuse for CASSANDRA-16350
2021-04-13 10:49:31 +02:00
Brandon Williams 4164313f92 Don't wait for migrations from removed nodes, mention flag to skip
Patch by brandonwilliams; reviewed by Adam Holmberg, adelapena and
bdeggleston for CASSANDRA-16577
2021-04-12 17:08:02 -05:00
Ekaterina Dimitrova 80beb83cf9 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-04-08 18:20:49 -04:00
Mick Semb Wever 1ecf5d0e8e Fix dtest-jar building when switching branches in circleci
patch by Brandon Williams and Mick Semb Wever; tested and reviewed by Ekaterina Dimitrova for CASSANDRA-16572
2021-04-08 18:17:05 -04:00
Ekaterina Dimitrova 7b10f9cb03 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-04-07 15:34:42 -04:00
Ekaterina Dimitrova 3edacd632c Scheduled (delayed) schema pull tasks should not run after MIGRATION stage shutdown during decommission
patch by Ekaterina Dimitrova; reviewed by Caleb Rackliffe and Yifan Cai for CASSANDRA-16495
2021-04-07 15:10:30 -04:00
Angelo Polo 6edd7db751
Eliminate gen-doc template warning and unused (problematic) import
gen-doc is now python3 compatible

 patch by Angelo Polo; reviewed by Ekaterina Dimitrova, Mick Semb Wever for CASSANDRA-16206
2021-04-07 17:50:24 +02:00
Mick Semb Wever 9e513390b7
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-27 00:36:11 +01:00
Mick Semb Wever 35114d5fcc
Merge branch 'cassandra-2.2' into cassandra-3.0 2021-03-27 00:32:09 +01:00
Mick Semb Wever cd4aa9f77c
ninja-fix missing copyright headers 2021-03-27 00:29:58 +01:00
Stefan Miklosovic ec9b7b9d37
Expose StorageServiceMBean#getKeyspaceReplicationInfo (backport from 4.0 and CASSANDRA-13853)
patch by Stefan Miklosovic; reviewed by Mick Semb Wever for CASSANDRA-16447
2021-03-26 10:05:16 +01:00
Mick Semb Wever e9209527f2
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-19 18:02:01 +01:00
Mick Semb Wever 1ee18ac22d
Merge branch 'cassandra-2.2' into cassandra-3.0 2021-03-19 17:57:34 +01:00
Mick Semb Wever 730e89e229
Remove ant targets list-jvm-dtests and ant list-jvm-upgrade-dtests
patch by Mick Semb Wever; reviewed by Alex Petrov for CASSANDRA-16519
2021-03-19 17:36:19 +01:00
Marcus Eriksson 8257868f32 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-18 09:37:50 +01:00
Marcus Eriksson 32394e9d0e Ignore trailing zeros in hint files
Patch by marcuse; reviewed by Aleksey Yeschenko for CASSANDRA-16523
2021-03-18 09:35:37 +01:00
Brandon Williams 16b0d1dec0 Ninja remove unused test import 2021-03-16 12:18:55 -05:00
Alex Petrov 2a6e4df054 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-15 12:33:15 +01:00
Alex Petrov 28decd307f CFS.setCompressionParameters() method can affect schema globally
Patch by Alex Petrov; reviewed by Aleksey Yeschenko for CASSANDRA-12949
2021-03-15 12:30:32 +01:00
Ekaterina Dimitrova b654000936 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-10 20:53:06 -05:00
Sylvain Lebresne efde6a76f9 Refuse DROP COMPACT STORAGE if some 2.x sstables are in use
patch by Sylvain Lebresne; review changes and tests by Ekaterina Dimitrova; reviewed by Benjamin Lerer and Brandon Williams for CASSANDRA-15897
2021-03-10 20:33:54 -05:00
Andrés de la Peña dc82d481d9 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-10 17:27:03 +00:00
Andrés de la Peña 9c7b69e422 Fix ColumnFilter::toString not returning a valid CQL fragment
patch by Andrés de la Peña; reviewed by Benjamin Lerer for CASSANDRA-16483
2021-03-10 17:19:17 +00:00
Mick Semb Wever 4a804eb807
Merge branch 'cassandra-3.0' into cassandra-3.11 (including c8d2394, 6524903, cf0be97) 2021-03-10 10:59:07 +01:00
Mick Semb Wever 81e472571a
Merge branch 'cassandra-2.2' into cassandra-3.0 2021-03-10 10:30:46 +01:00
Mick Semb Wever a7b71eb63e
ninja-fix CHANGES.txt (CASSANDRA-16477) 2021-03-10 10:26:25 +01:00
Brandon Williams cf0be97894 Revert "Update debian packaging to python3"
This reverts commit 8c43f510a3.
2021-03-09 17:23:43 -06:00
Brandon Williams 6524903c22 Revert "Ninja update debian packaging to python3 from python for CASSANDRA-16478"
This reverts commit c775ea3fa7.
2021-03-09 17:23:43 -06:00
Brandon Williams c8d239436f Revert "Remove python3:Depends from Debian packaging"
This reverts commit 2022cfe073.
2021-03-09 17:23:43 -06:00
Brandon Williams ce075b3ee4 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-09 17:21:02 -06:00
Brandon Williams 03d79c06d5 Revert "Update debian packaging to python3"
This reverts commit 8c43f510a3.
2021-03-09 17:20:50 -06:00
Brandon Williams 8441d88d6d Revert "Ninja update debian packaging to python3 from python for CASSANDRA-16478"
This reverts commit c775ea3fa7.
2021-03-09 17:20:01 -06:00
Brandon Williams a895724c2e Revert "Remove python3:Depends from Debian packaging"
This reverts commit 2022cfe073.
2021-03-09 17:19:49 -06:00
Mick Semb Wever 67b8504b20
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-09 22:34:43 +01:00