Commit Graph

660 Commits

Author SHA1 Message Date
Stefan Miklosovic 6cdcf5e56a
Prepare debian changelog for 3.11.15 2023-04-28 12:30:03 +02:00
Stefan Miklosovic f2427a0c86
Increment version to 4.0.10 2023-04-14 11:20:04 +02:00
Stefan Miklosovic e9f8f2efa2
Prepare debian changelog for 4.0.9 2023-04-11 09:31:56 +02:00
Stefan Miklosovic 99f62b7338
Prepare debian changelog for 4.0.9 2023-04-04 09:29:07 +02:00
Stefan Miklosovic 8d91b469af
Prepare debian changelog for 4.1.1 2023-03-15 09:09:07 +01:00
Mick Semb Wever 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
Stefan Miklosovic 7b079503eb
Increment version to 4.0.9 2023-02-15 10:12:15 +01:00
Stefan Miklosovic 32c56df067
Prepare debian changelog for 4.0.8 2023-02-07 22:35:13 +01:00
Mick Semb Wever af5029d643
Increment versions to 4.1.1 2022-12-16 11:34:23 -08:00
Mick Semb Wever f9e033f519
Prepare debian changelog for 4.1.0 2022-12-07 21:53:57 +01:00
Mick Semb Wever b807f97b37
Prepare debian changelog for 4.1.0 2022-11-22 15:58:24 +01:00
Mick Semb Wever 676b3e4483
Increment version to 4.1.0 2022-11-22 15:41:18 +01:00
Mick Semb Wever d6822c45ae
Prepare debian changelog for 4.1-rc1 2022-11-17 11:33:50 +01:00
Mick Semb Wever 6be7fed242
Prepare for 4.1-rc1 2022-11-17 10:55:14 +01:00
Brandon Williams bba519501c add python2-dev to build-deps
Patch by brandonwilliams; reviewed by edimitrova for CASSANDRA-17871
2022-11-03 08:06:44 -05: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
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 c4bccb000a
Increment version to 4.1-beta2 2022-10-05 17:14:37 -05:00
Mick Semb Wever 5d9d93ea08
Prepare debian changelog for 4.1-beta1 2022-09-27 00:08:43 +02:00
Mick Semb Wever 65c9875b39
increment version to 4.1-beta1
ref: https://lists.apache.org/thread/ho4r1lk2gsgs1z61ldzg64h84x3rbg4o
2022-09-26 23:33:01 +02:00
Mick Semb Wever d82cb5703d
Increment version to 4.0.7 2022-08-25 17:49:58 +02:00
Mick Semb Wever eb23757184
Prepare debian changelog for 4.0.6 2022-08-18 20:31:54 +02:00
Mick Semb Wever c5747547fa
Increment version to 4.0.6 2022-07-18 22:29:36 +02:00
Mick Semb Wever ec476e0e25
Prepare debian changelog for 4.0.5 2022-07-12 12:16:55 +02:00
Brandon Williams 067f4c7461 Merge branch 'cassandra-4.1' into trunk 2022-06-08 11:19:35 -05:00
Brandon Williams fd547aff55 Merge branch 'cassandra-4.0' into cassandra-4.1 2022-06-08 11:18:59 -05:00
Brandon Williams 3fdd99e60b Allow java 11 in Debian packaging
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17669
2022-06-08 11:15:13 -05:00
Mick Semb Wever 1ca7a11dd0
Increment version to 4.1-alpha2 2022-05-27 23:07:34 +02:00
Brandon Williams 39d372539f set perms on data/logs to 750 in debian packaging
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17470
2022-05-25 06:19:53 -05:00
Mick Semb Wever 6f05be4470
Prepare debian changelog for 4.1-alpha1 2022-05-20 22:03:07 +02:00
Mick Semb Wever 33b6a3d0f9
Prepare for 4.1-alpha1
ref: https://lists.apache.org/thread/hm2ljw4cpwvlb2hf79hpg78s74w39of0
2022-05-20 13:55:34 +02:00
Mick Semb Wever 756683c7cf
Prepare debian changelog for 4.0.4, bump version to 4.0.5 2022-05-14 01:29:41 +02:00
Mick Semb Wever 6ad666e3a8
Prepare debian changelog for 3.11.13, bump version to 3.11.14 2022-05-14 01:28:32 +02:00
Mick Semb Wever f20f17b4a7
Prepare debian changelog for 3.0.27, bump version to 3.0.28 2022-05-14 01:26:46 +02:00
Mick Semb Wever 413f1aed27
Create release branch cassandra-4.1, increment trunk version to 4.2 2022-05-01 23:22:08 +02:00
Brandon Williams b73b9bbd11 Add procps Debian dependency
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17516
2022-04-13 07:10:11 -05:00
Brandon Williams c9e1f42dd6 Add procps Debian dependency
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17516
2022-04-13 07:05:00 -05:00
Brandon Williams 84bc0e8c3b Add procps Debian dependency
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17516
2022-04-13 07:02:03 -05:00
Brandon Williams 62798f2143 Add procps Debian dependency
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17516
2022-04-13 07:00:47 -05:00
Bereng 30ad754d7e Pre hashed passwords in CQL
patch by Robert Stupp and Berenguer Blasi; reviewed by Andres de la Peña for CASSANDRA-17334

Co-authored-by: Robert Stupp <snazy@snazy.de>
Co-authored-by: Berenguer Blasi <berenguerblasi@gmail.com>
2022-03-23 07:20:14 +01:00
Mick Semb Wever 894d33ce40
Increment version to 4.0.4 2022-02-17 09:26:44 +01:00
Mick Semb Wever a87055d56a
Prepare debian changelog for 4.0.3 2022-02-13 22:38:04 +01:00
Mick Semb Wever d0f4b42956
Increment version to 4.0.3 2022-02-11 11:08:24 +01:00
Mick Semb Wever 25828cb9b1
Increment version to 3.0.27 2022-02-11 11:06:48 +01:00
Mick Semb Wever 1e015ed2a2
Increment version to 3.11.13 2022-02-11 11:06:25 +01:00
Mick Semb Wever 25012d2fec
Prepare debian changelog for 4.0.2 2022-02-07 14:42:53 +01:00
Mick Semb Wever b44ff92eb2
Prepare debian changelog for 3.11.12 2022-02-07 13:56:41 +01:00
Mick Semb Wever b18adcba1a
Prepare debian changelog for 3.0.26 2022-02-07 13:14:30 +01:00
Mick Semb Wever e6b589b833
Merge branch 'cassandra-4.0' into trunk 2022-01-23 13:07:00 +01:00
Mick Semb Wever e769d0d6d6
Merge branch 'cassandra-3.11' into cassandra-4.0 2022-01-23 13:03:54 +01:00
Mick Semb Wever 9c6efe1222
Bump copyright to 2009-2022 2022-01-23 13:01:58 +01:00
Brandon Williams be9db0980b Rename cassandra-topology.properties to example
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-16912
2021-11-16 10:10:15 -06:00
Brandon Williams cb1c8f9d34 Merge branch 'cassandra-4.0' into trunk 2021-09-21 09:24:57 -05:00
Brandon Williams 053806c320 Merge branch 'cassandra-3.11' into cassandra-4.0 2021-09-21 09:24:43 -05:00
Brandon Williams 9dbebb0b6f Merge branch 'cassandra-3.0' into cassandra-3.11 2021-09-21 09:24:05 -05:00
Brandon Williams ea3cca04eb Debian init respects CASSANDRA_HEAPDUMP_DIR
Patch by Brandon Williams; reviewed by adelapena for CASSANDRA-13843
2021-09-21 09:22:25 -05:00
Sam Tunnicliffe 9a34ecd4ad Increment version to 4.0.2 2021-09-07 16:50:51 +01:00
Sam Tunnicliffe 6709111ed0 Prepare debian changelog for 4.0.1 2021-08-30 11:28:33 +01:00
Brandon Williams 4cafe2288e Prepare for release 3.11.11 2021-07-25 12:39:42 -05:00
Brandon Williams 06235e93e1 Prepare for release 3.0.25 2021-07-25 11:44:51 -05:00
Mick Semb Wever 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
Mick Semb Wever 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
Mick Semb Wever 80fd439be1
Merge branch 'cassandra-4.0.0' into cassandra-4.0 2021-07-08 23:44:06 +02:00
Mick Semb Wever 09a387bd3d
Change version from 4.0-rc3 to 4.0.0 2021-07-08 23:28:37 +02:00
Mick Semb Wever 1de960b433
ninja-fix: return cassandra-4.0's version and debian/changelog to 4.0-rc3 (4.0.x version numbers are not yet supported: CASSANDRA-16781 and CASSANDRA-16649) 2021-07-02 15:46:10 +02:00
Mick Semb Wever c79124d5e6
Merge branch 'cassandra-4.0.0' into cassandra-4.0 2021-06-30 21:55:25 +02:00
Mick Semb Wever d13bef96fd
Increment version to 4.0-rc3 2021-06-30 21:53:31 +02:00
Mick Semb Wever 4c98576533
Prepare debian changelog for 4.0-rc2 2021-06-27 16:37:09 +02:00
Brandon Williams b96a48e63d Merge branch 'cassandra-3.0' into cassandra-3.11 2021-06-16 13:52:00 -05:00
Brandon Williams 2e2bcc5261 Add 'python2' to debian packaging for Ubuntu.
Patch by brandonwilliams, reviewed by mck for CASSANDRA-16605
2021-06-16 13:49:21 -05:00
Mick Semb Wever d2b57fe463
Create release branch cassandra-4.0, increment trunk version to 4.1 2021-05-01 12:13:59 +02:00
Mick Semb Wever bd488e49f2
Increment version to 4.0-rc2 2021-04-25 13:56:07 +02:00
Mick Semb Wever 3282f5ecf1
Prepare debian changelog for 4.0-rc1 2021-04-21 19:32:21 +02: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
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 cf39d03127
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-16391
2021-04-02 10:17:08 +02:00
Mick Semb Wever 2facbc97ea
Prepare debian changelog for 4.0-rc1 2021-03-26 20:56:21 +01:00
Mick Semb Wever 8f5b7fec71
Change version 4.0-beta5 to 4.0-rc1 2021-03-26 20:45:34 +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
Brandon Williams 92b48a73be Merge branch 'cassandra-3.11' into trunk 2021-03-05 08:27:43 -06:00
Brandon Williams 034a9375e5 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-05 08:26:38 -06:00
Brandon Williams 2022cfe073 Remove python3:Depends from Debian packaging
Patch by brandonwilliams, reviewed by Alexander Dejanovski for
CASSANDRA-16480
2021-03-05 08:25:34 -06:00
Brandon Williams d29dd643df Merge branch 'cassandra-3.11' into trunk 2021-03-03 07:39:03 -06:00
Brandon Williams 0f2c9da47a Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-03 07:38:45 -06:00
Brandon Williams c775ea3fa7 Ninja update debian packaging to python3 from python for CASSANDRA-16478 2021-03-03 07:38:33 -06:00
Mick Semb Wever e2b5c0f7ef
Merge branch 'cassandra-3.11' into trunk 2021-02-27 17:07:50 +01:00
Mick Semb Wever a311109e31
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-02-27 17:01:28 +01:00
Brandon Williams 8c43f510a3
Update debian packaging to python3
patch by Brandon Williams; reviewed by Mick Semb Wever for CASSANDRA-16396
2021-02-27 17:00:09 +01:00
Mick Semb Wever b04429b57c
ninja-fix debian cassandra.yaml patch for CASSANDRA-14793 2021-02-04 16:38:33 +01:00
Alex Petrov ed51d02f7c Increment version to 3.11.11 2021-02-01 16:02:21 +01:00
Alex Petrov f35ab19dbe Increment version to 3.0.25 2021-02-01 15:59:15 +01:00
Alex Petrov 181a496929 Prepare debian changelog for 3.11.10 2021-01-29 13:27:54 +01:00
Alex Petrov 6748ecd63c Prepare debian changelog for 3.0.24 2021-01-29 12:21:13 +01:00
Mick Semb Wever 200615ded5
Increment version to 4.0-beta5 2020-12-30 12:47:53 +01:00
Mick Semb Wever b0c50c10db
Prepare debian changelog for 4.0-beta4 2020-12-18 18:33:39 +01:00
Mick Semb Wever 2346ed8241
Offline token allocation strategy generator tool
Provides the tools/bin/generate-tokens script that can be used to pregenerate allocation strategy tokens.
Refactors TokenAllocation for extensibility (and better re-use between strategies), and adds OfflineTokenAllocator.
TokenMetadata now has a configurable snitch (instead of hardcoded to DatabaseDescriptor.getEndpointSnitch()) for testability.
Adds logging of growth and stddev changes to allocate_tokens_for_local_replication_factor usages.

 patch by Mick Semb Wever; reviewed by Paul Motta, Ekaterina Dimitrova for CASSANDRA-16205
2020-12-03 19:20:59 +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
Mick Semb Wever be716b46f2
Prepare debian changelog for 4.0-beta3 2020-10-29 13:00:34 +01:00
Mick Semb Wever 5ef75dd96c
Prepare debian changelog for 3.11.9 2020-10-29 12:33:00 +01:00
Mick Semb Wever 31530ff5ac
Prepare debian changelog for 3.0.23 2020-10-29 12:04:50 +01:00
Mick Semb Wever 0d9462efc2
Prepare debian changelog for 2.2.19 2020-10-29 11:36:14 +01:00
Marcus Eriksson 9a30167909 ninja fix build, add jmxtool to rpm and deb packaging 2020-09-16 12:55:44 +02: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 56eadf2004
Prepare debian changelog for 4.0-beta2 2020-08-28 15:54:49 +02:00
Mick Semb Wever 8b29b69863
Prepare debian changelog for 3.11.8 2020-08-28 15:13:27 +02:00
Mick Semb Wever 45331bb612
Prepare debian changelog for 3.0.22 2020-08-28 14:49:52 +02:00
Mick Semb Wever d4938cf4e4
Prepare debian changelog for 2.2.18 2020-08-28 14:25:39 +02:00
Mick Semb Wever 94e9149c22
Prepare debian changelog for 2.1.22 2020-08-28 13:16:01 +02:00
Mick Semb Wever a8808153cf
fix debian changelog after 3.11.7
(`git cherry-pick -n 9fe62b3`)
2020-07-24 21:58:33 +02:00
Mick Semb Wever 972da6fcff
Prepare debian changelog for 4.0-beta1 2020-07-17 23:22:38 +02:00
Mick Semb Wever 5e76771136
Prepare debian changelog for 4.0-beta1 2020-07-14 23:42:00 +02:00
Mick Semb Wever e39d1da325
Prepare debian changelog for 3.0.21 2020-07-14 22:15:26 +02:00
Mick Semb Wever cd006d275a
Prepare debian changelog for 2.2.17 2020-07-14 21:31:28 +02:00
Stefan Miklosovic ecf2c9ccd4
Add fqltool and auditlogviewer to rpm and deb packages
patch by Stefan Miklosovic; reviewed by Mick Semb Wever for CASSANDRA-14712
2020-06-03 18:31:26 +02:00
Brandon Williams 712b43408a Merge branch 'cassandra-3.11' into trunk 2020-04-29 12:03:53 -05:00
Brandon Williams 5fe434c4ab Merge branch 'cassandra-3.0' into cassandra-3.11 2020-04-29 12:03:31 -05:00
Vicente Jimenez Aguilar 469c6496ae Fix init script for debian Buster
Patch by Vicente Jimenez Aguilar, reviewed by brandonwilliams for
CASSANDRA-15770
2020-04-29 12:01:34 -05:00
Mick Semb Wever d00c004cc1
Prepare debian changelog for 4.0-alpha4 2020-04-11 00:28:22 +02:00
Brandon Williams 324267b3c0 Merge branch 'cassandra-3.11' into trunk 2020-02-26 11:51:01 -06:00
Michael Shuler 8f958195cd Bump version to 3.11.7 2020-02-14 18:49:22 -06:00
Michael Shuler 899a4fd663 Bump version to 3.0.21 2020-02-14 18:44:09 -06:00
Michael Shuler 5f0cf80c0a Bump version to 2.2.17 2020-02-14 18:41:47 -06:00
Mick Semb Wever cb779ab9a6
Prepare debian changelog for 3.11.6 2020-02-10 23:54:06 +01:00
Mick Semb Wever 89edf5073b
Prepare debian changelog for 3.0.20 2020-02-10 22:53:37 +01:00
Mick Semb Wever c4d9e9ca4a Prepare debian changelog for 2.2.16 2020-02-10 10:55:15 +01:00
Mick Semb Wever 6aa68ef608 ninja-fix: correct debian/changelog version, author, timestamp (CASSANDRA-15541) 2020-02-10 09:34:03 +11:00
Mick Semb Wever a064bbd264
Increment version to 4.0-alpha4 2020-02-07 21:18:16 +01:00
Mick Semb Wever 729146a074
Merge branch 'cassandra-3.11' into trunk 2020-01-29 23:34:34 +01:00
Mick Semb Wever 37ce4618b5
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-01-29 23:33:30 +01:00
Mick Semb Wever 7816301ef2
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-01-29 23:19:17 +01:00
Michael Shuler 6d93f046c2 Increment version to 4.0-alpha3 2019-10-29 16:17:35 -05:00