Commit Graph

674 Commits

Author SHA1 Message Date
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
Michael Shuler fb50d823b6 Increment version to 3.11.6 2019-10-29 16:15:49 -05:00
Michael Shuler ae366ba615 Increment version to 3.0.20 2019-10-29 16:11:57 -05:00
Michael Shuler a593d7b358 Increment version to 2.2.16 2019-10-29 16:09:30 -05:00
Michael Shuler 4ee4ceea28 Fix 2.2 deb Build-Depends JDK version to match build.xml source.version 2019-10-24 09:49:13 -05:00
Michael Shuler 53bdc64a0e Prepare for release, set version build date, fix whitespace 2019-10-24 09:14:05 -05:00
Michael Shuler 94577bc4dc Prepare for release, set version build date, fix whitespace/typo 2019-10-24 09:00:41 -05:00
Michael Shuler 98f56c1208 Prepare for release, set version build date, fix whitespace 2019-10-24 08:57:29 -05:00
Michael Shuler f00e01f0b2 Prepare for release, set version build date 2019-10-24 08:54:03 -05:00
Mick Semb Wever 21ebba85ac
Update version to 4.0-alpha2 2019-09-10 07:17:51 +02:00
Michael Shuler fa167135f8 Set debian/changelog version to 4.0~alpha1 2019-09-03 11:52:24 -05:00
Michael Shuler 75fde25a75 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-06-27 09:52:42 -05:00
Michael Shuler dc23631ab1 Update log directory patch for deb package
Patch by Michael Shuler; Reviewed by Jon Haddad for CASSANDRA-15185
2019-06-27 09:49:43 -05:00
Michael Shuler 61b77ac2b0 Update log directory patch for 4.0 deb package
Patch by Michael Shuler; Reviewed by Jon Haddad for CASSANDRA-15185
2019-06-26 14:30:39 -05:00
Michael Shuler 3a87604e4c Use quilt to patch cassandra.in.sh in Debian packaging
Patch by Michael Shuler; Reviewed by Jan Karlsson for CASSANDRA-14710
2019-05-09 10:55:09 -05:00
Ariel Weisberg 2a7091616e Merge branch 'cassandra-3.11' into trunk 2019-02-13 13:01:39 -05:00
Ariel Weisberg 4013eacd9d Merge branch 'cassandra-3.0' into cassandra-3.11 2019-02-13 12:58:23 -05:00
jean carlo 4f2fe19520 Add missing commands to nodetool-completion
Patch by Jean Carlo; Reviewed by Dinesh Joshi for CASSANDRA-14916
2019-02-13 12:48:29 -05:00
Michael Shuler 123113f7b8 Update version to 3.11.5 2019-02-11 21:16:03 -06:00
Michael Shuler 229f8b3a44 Update version to 3.0.19 2019-02-11 21:09:23 -06:00
Michael Shuler ce6bcaa5b8 Update version to 2.2.15 2019-02-11 21:01:30 -06:00
Michael Shuler fd47391aae Update version to 3.11.4 2019-02-01 12:40:38 -06:00
Michael Shuler edd52cef50 Update version to 3.0.18 2019-02-01 12:38:25 -06:00
Michael Shuler af91658353 Update version to 2.2.14 2019-02-01 12:36:13 -06:00
Michael Shuler 9bb75358df Update version to 2.1.21 2019-02-01 12:33:15 -06:00
Michael Shuler 0d81fca44e Update URLs for gitbox.apache.org migration 2019-01-09 14:17:03 +00:00
Michael Shuler f424e03a44 Switch Debian packaging to quilt patches
Future Debian package patching guide:
  https://wiki.debian.org/UsingQuilt#Making_a_new_patch
  https://wiki.debian.org/UsingQuilt#Editing_an_existing_patch

Patch by Michael Shuler; Reviewed by Jon Haddad for CASSANDRA-14707
2018-09-08 15:48:13 -05:00
Robert Stupp 6ba2fb9395 Make C* compile and run on Java 11 and Java 8
patch by Robert Stupp; reviewed by Jason Brown for CASSANDRA-9608
2018-07-26 18:20:00 +02:00
Michael Shuler aed1b5fdf1 Update version to 3.11.3 2018-07-02 13:37:32 -05:00
Michael Shuler c4e6cd2a1a Update version to 3.0.17 2018-07-02 13:31:09 -05:00
Michael Shuler 9ff78249a0 Update version to 2.2.13 2018-07-02 13:27:39 -05:00
Paulo Motta 6034c268c3 Merge branch 'cassandra-3.11' into trunk 2018-02-10 15:03:59 -02:00
Paulo Motta 0a6b6f506b Merge branch 'cassandra-3.0' into cassandra-3.11 2018-02-10 14:59:28 -02:00
Paulo Motta c231ed5be0 Merge branch 'cassandra-2.2' into cassandra-3.0 2018-02-10 14:57:53 -02:00
Paulo Motta 1602e60634 Merge branch 'cassandra-2.1' into cassandra-2.2 2018-02-10 14:54:56 -02:00
Michael Shuler aee02e4854 Update version to 3.11.2 2017-10-10 17:19:20 -05:00
Michael Shuler a04d627140 Update version to 3.0.16 2017-10-10 17:14:47 -05:00
Michael Shuler 797de4ae3c Update version to 2.2.12 2017-10-05 10:22:46 -05:00
Michael Shuler d4fd82be5d Update version to 2.1.20 2017-10-05 10:19:50 -05:00
Michael Shuler 665f69370a Add 2.1.19 release to debian/changelog 2017-09-11 16:53:06 -05:00
Michael Shuler 24389f4809 Increment to version 3.11.1 2017-06-26 18:56:43 -05:00
Michael Shuler 000381ab12 Increment to version 3.0.15 2017-06-26 18:50:40 -05:00
Michael Shuler 0163b97449 Increment to version 2.2.11 2017-06-26 18:46:28 -05:00
Michael Shuler c9d3b30dbd Prepare 2.2.10 release 2017-06-21 14:08:31 -05:00
Michael Shuler 9369db1dfd Prepare 2.1.18 release
- release debian/changelog
- backport RPM packaging fixes from cassandra-2.2 branch for
  CASSANDRA-13046, CASSANDRA-13434, CASSANDRA-13435, CASSANDRA-13433,
  and CASSANDRA-13493
2017-06-21 14:04:21 -05:00
Michael Shuler 88dee7e9d5 Release 3.11.0 in debian/changelog 2017-06-19 17:42:53 -05:00
Michael Shuler 30b01a02fe Increment version to 3.0.14 2017-04-14 20:02:43 -05:00
Michael Shuler 91661ec296 Prep 3.0.13 release 2017-04-11 12:54:01 -05:00
Michael Shuler aa65c6c548 Merge branch 'cassandra-3.11' into trunk 2017-04-10 09:12:10 -05:00
Michael Shuler 1a7b1ee4d1 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-04-10 09:11:54 -05:00
Michael Shuler f63ea27276 Merge branch 'cassandra-2.2' into cassandra-3.0 2017-04-10 09:11:32 -05:00
Michael Shuler 590e1512a9 Merge branch 'cassandra-2.1' into cassandra-2.2 2017-04-10 09:09:22 -05:00
Jan Urbański 3dfc78449a Add conf/hostpot_compiler to debian packaging
Patch by Jan Urbański; reviewed by Michael Shuler for CASSANDRA-13092
2017-04-10 09:06:13 -05:00
Michael Shuler 50560aaf0f Update debian/changelog for 3.0.12 release 2017-03-07 09:30:12 -06:00
Michael Shuler 6432346640 Merge branch 'cassandra-3.11' into trunk 2017-03-03 12:42:40 -06:00
Michael Shuler a830cf528e Merge branch 'cassandra-3.0' into cassandra-3.11 2017-03-03 12:42:19 -06:00
Michael Shuler 244f887f4c Merge branch 'cassandra-2.2' into cassandra-3.0 2017-03-03 12:42:00 -06:00
Michael Shuler 288d243d80 Update ant build dependency to >= 1.9 in deb/rpm 2017-03-03 12:39:37 -06:00
Michael Shuler 0eae9084e6 Increment to version 3.0.12 2017-02-21 14:07:09 -06:00
Michael Shuler 7841908c3c Increment to version 2.2.10 2017-02-21 14:03:53 -06:00
Michael Shuler de1f24d70f Increment to version 2.1.18 2017-02-21 14:00:54 -06:00
Michael Shuler b6fdaba6ea Add 4.0 to debian/changelog 2017-02-15 18:21:42 -06:00
Michael Shuler 338226e042 Update debian/changelog for 3.0.11 release 2017-02-15 18:15:54 -06:00
Michael Shuler 70a08f1c35 Add 2.2.9 release to debian/changelog 2017-02-15 18:13:56 -06:00
Michael Shuler 943db2488c Add 2.1.17 NEWS entry and bump debian/changelog timestamp 2017-02-15 18:10:51 -06:00
Michael Shuler f71e7e1fed Increment version to 3.11.0 2017-02-03 18:27:02 -06:00
Sylvain Lebresne 4881d9c308 Thrift removal
patch by Sylvain Lebresne; reviewed by Aleksey Yeschenko for CASSANDRA-11115
2016-12-13 10:27:12 +01:00
Michael Shuler ac279e2f71 Increment version to 3.0.11 and fix a CHANGES entry 2016-11-16 14:31:31 -06:00
Michael Shuler 817ba03878 Release 3.0.10 2016-10-31 10:34:24 -05:00
Michael Shuler a3828ca8b7 Release 3.10 2016-10-31 08:55:51 -05:00
Michael Shuler 83ae5f3398 Bump version to 2.1.17 2016-10-10 17:09:10 -05:00
Michael Shuler 87034cd059 Prepare 2.1.16 release 2016-10-05 17:18:52 -05:00
Michael Shuler 6baae9c0c2 Update d/changelog dates and set UNRELEASED on 3.10 2016-09-26 09:08:47 -05:00
Michael Shuler e9fe96f404 Bump base.version and d/changelog to 2.2.8 2016-09-23 16:42:46 -05:00
Michael Shuler 0c90485b74 Update debian/changelog for 3.10 2016-08-16 18:27:39 -05:00
Michael Shuler 8b5b1854c3 Update build.xml and debian/changelog for 3.0.9 2016-08-16 18:04:08 -05:00
T Jake Luciani 1cff5faea1 version 3.0.8 2016-06-28 20:14:03 -04:00
T Jake Luciani ea8c430124 version 2.2.7 2016-06-28 20:10:15 -04:00
T Jake Luciani cb14186f8d version 2.1.15 2016-06-28 20:06:55 -04:00
T Jake Luciani d9a4c78a32 bump deb version 2016-06-27 20:42:01 -04:00
T Jake Luciani 040ac666ac bump debian to 3.0.7 2016-06-06 14:28:41 -04:00
T Jake Luciani 52447873a3 new debian release for 3.0 2016-05-03 09:35:56 -04:00
T Jake Luciani fb5d7f0b07 bump deb version 2016-05-03 09:18:17 -04:00
Stefania Alborghetti 16e3507534 Merge branch 'cassandra-3.0' into trunk 2016-04-29 08:18:13 +08:00
Stefania Alborghetti 32112d80e2 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-29 08:17:43 +08:00
Stefania Alborghetti 38e973d08f Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-29 08:17:21 +08:00
Michael Shuler 86c5a00c23 deb package migration to dh_python2, added missing debian rules
Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853
2016-04-29 08:16:02 +08:00
T Jake Luciani ac902a505e Merge branch 'cassandra-3.0' into trunk 2016-04-26 13:15:05 -04:00
T Jake Luciani 5d37fc4c4e Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-26 13:13:42 -04:00
T Jake Luciani cfc398e818 Add missing tools to debian package
Patch by tjake and Michael Shuler; reviewed by Michael Shuler for CASSANDRA-11642
2016-04-26 13:08:03 -04:00
T Jake Luciani 75177696da Merge branch 'cassandra-3.0' into trunk 2016-04-26 12:29:35 -04:00
T Jake Luciani 8d69cabd5a deb package migration to dh_python2
Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853
2016-04-26 12:29:06 -04:00
T Jake Luciani ae03066f4c deb package migration to dh_python2
Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853
2016-04-26 12:13:48 -04:00
T Jake Luciani fb20023fb5 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-26 12:11:15 -04:00
T Jake Luciani 26e0a33faf deb package migration to dh_python2
Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853
2016-04-26 12:06:46 -04:00
T Jake Luciani 5c5c5b44c6 2.1.14 version bump 2016-04-15 10:30:21 -04:00
T Jake Luciani 220e4f62db 2.2.6 version bump 2016-04-15 10:00:04 -04:00
T Jake Luciani c6e6fa94d2 3.0.5 version bump 2016-04-02 07:58:13 -04:00
T Jake Luciani 5ea02a2ce0 bump version for 3.4 2016-02-29 10:42:46 -05:00
T Jake Luciani ac06c5bf7d bump versions for 3.0.4 2016-02-29 10:37:34 -05:00
T Jake Luciani 21380fc129 3.0.3 release versions 2016-02-03 08:56:26 -05:00
T Jake Luciani dd76858c76 2.2.5 build 2016-01-26 09:16:43 -05:00
T Jake Luciani d5b6d1b634 2.1.13 build 2016-01-26 09:12:48 -05:00
Ariel Weisberg 87d80b478b Enable GC logging by default (3.0 version)
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
2016-01-08 10:32:22 +01:00
Ariel Weisberg 3e45fa1ab5 Enable GC logging by default (3.0 version)
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
2016-01-05 18:01:29 +01:00
Ariel Weisberg c04bf2a9bb Enable GC logging by default
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
2016-01-05 17:49:42 +01:00
T Jake Luciani 1568293408 bump deb version 2016-01-05 10:25:39 -05:00
Marcus Eriksson f61cc0d88e Fix debian install script
Patch by Michael Shuler; reviewed by marcuse for CASSANDRA-10851
2015-12-14 08:22:41 +01:00
Nicolas Lalevée 2cd18ef5a0 Add compressor name in the output of sstablemetadata
Patch by Nicolas Lalevee; reviewed by marcuse for CASSANDRA-9879
2015-12-11 14:38:34 +01:00
T Jake Luciani e092873728 3.1 version 2015-12-04 16:00:43 -05:00
T Jake Luciani cf567703db 3.0 bump version 2015-12-04 15:56:51 -05:00
T Jake Luciani 16045358a4 bump 2.2 versions 2015-12-02 10:53:01 -05:00
T Jake Luciani a6619e56b1 bump 2.1 versions 2015-12-02 10:50:22 -05:00
Robert Stupp 9a2fd8ccf3 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-27 15:26:02 +01:00
Robert Stupp 0ee8895b27 Show CQL help in cqlsh in web browser
patch by Robert Stupp; reviewed by Paulo Motta for CASSANDRA-7225
2015-11-27 15:24:51 +01:00
Robert Stupp b166f5f3fe Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-27 12:58:46 +01:00
Robert Stupp d44dbe1929 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-27 12:58:16 +01:00
Ruggero Marchei 8cd13f1381 Status command in debian/ubuntu init script doesn't work
patch by Ruggero Marchei; reviewed by Michael Shuler for CASSANDRA-10213
2015-11-27 12:57:49 +01:00
T Jake Luciani 96f407bce5 3.0 release versions 2015-11-06 14:38:34 -05:00
Brandon Williams ad007f0124 Fix debian package build
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-10620
2015-10-29 16:06:21 -05:00
Sylvain Lebresne 8be382a7ed Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
	CHANGES.txt
2015-10-21 14:29:58 +02:00
Sylvain Lebresne d3085b1baa Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
	CHANGES.txt
2015-10-21 14:27:46 +02:00
Sylvain Lebresne 9d8436f922 Avoid repetition of JVM_OPTS in debian package
patch by urandom; reviewed by mshuler for CASSANDRA-8821
2015-10-21 14:26:22 +02:00
T Jake Luciani 56a06d78f2 bump versions 2015-10-16 16:03:16 -04:00
Paulo Motta c3b2aedfd8 Define cassandra_storagedir variable in debian/cassandra.in.sh
patch by Paulo Motta; reviewed by Aleksey Yeschenko for CASSANDRA-10525
2015-10-15 23:13:25 +01:00
Paulo Motta 1415fa512a Revert 7486, make CMS default GC, move gc opts to conf/jvm.options
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10403
2015-10-14 14:36:52 -04:00
T Jake Luciani 8444302432 bump versions for 2.2.3 2015-10-12 09:50:39 -04:00
T Jake Luciani df6b27e36c bump versions for 2.1.11 2015-10-12 09:46:49 -04:00
T Jake Luciani ae9b7e0522 bump verion 2015-10-01 09:38:36 -04:00
T Jake Luciani 78f2e7aa01 bump version 2015-10-01 09:36:24 -04:00
T Jake Luciani c95a7098cf bump release 2015-09-19 16:03:29 -04:00
T Jake Luciani 17528910b8 bump versions 2015-09-04 19:11:39 -04:00
T Jake Luciani 3238906477 bump versions 2015-08-25 13:24:57 -04:00
T Jake Luciani 7d74563a25 bump versions 2015-08-25 09:39:15 -04:00
T Jake Luciani 356c755a3b fix debian packaging 2015-08-21 22:55:18 -04:00
T Jake Luciani 5f6da8f959 bump versions 2015-08-21 22:36:48 -04:00
T Jake Luciani b090ed6938 fix debian tools install 2015-07-30 10:16:24 -04:00
T Jake Luciani b44f409885 Fix debian build 2015-07-30 09:51:54 -04:00
T Jake Luciani 17bcb6d085 bump versions for alpha1 2015-07-30 09:31:17 -04:00
T Jake Luciani 13f2c1339c Merge branch 'cassandra-2.2' into trunk
Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
2015-07-17 13:11:23 -04:00
T Jake Luciani b10a51a423 bump versions for 2.2.0 2015-07-17 13:08:37 -04:00
T Jake Luciani e19d013568 Merge branch 'cassandra-2.2' into trunk 2015-07-06 13:39:07 -04:00
T Jake Luciani ebc50d7835 Remove tools/lib from deb rules 2015-07-06 13:38:30 -04:00
T Jake Luciani eb875b4af6 bump versions 2015-07-06 11:19:42 -04:00
T Jake Luciani 3796e8fa3e bump versions 2015-06-30 09:53:25 -04:00
T Jake Luciani 718c144324 bump versions 2015-06-18 14:53:07 -04:00
Benedict Elliott Smith eb266ce8d9 Merge branch 'cassandra-2.2' into trunk
Conflicts:
	build.xml
2015-06-07 12:47:41 +01:00
T Jake Luciani b0ae285bdc bump versions 2015-06-05 11:13:54 -04:00
T Jake Luciani e469f32be1 bump versions 2015-06-05 10:47:35 -04:00
Brandon Williams 6f55427920 Require jdk8 in debian packages
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-9408
2015-05-18 09:52:23 -05:00
T Jake Luciani 1735249ebf debian should use ~ 2015-05-17 22:21:49 -04:00
T Jake Luciani 3add8fbc70 Remove file from deb rules 2015-05-17 21:59:48 -04:00
T Jake Luciani c38968d7e0 deb version 2015-05-17 21:35:38 -04:00
T Jake Luciani 9a0b3956f1 bump version 2015-04-29 14:22:53 -04:00
T Jake Luciani b8717dc201 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	CHANGES.txt
	NEWS.txt
	bin/cassandra.bat
	build.xml
	conf/cassandra-env.sh
	src/java/org/apache/cassandra/service/CassandraDaemon.java
2015-04-01 11:11:53 -04:00
T Jake Luciani c041ea8b37 Bind JMX to localhost unless explicitly configured otherwise 2015-03-30 09:38:50 -04:00
Aleksey Yeschenko 21c5a41f05 Merge branch 'cassandra-2.1' into trunk 2015-02-10 00:47:06 +03:00
T Jake Luciani c1a2e0fa58 bump debian release 2015-02-09 10:35:57 -05:00
Tyler Hobbs 699a69de8d Merge branch 'cassandra-2.1' into trunk 2014-11-21 15:40:53 -06:00
blerer 1bb2dd906c Fix size calculations for prepared statements
Patch by Benjamin Lerer; reviewed by Dave Brosius for CASSANDRA-8231
2014-11-21 14:54:47 -06:00
Brandon Williams 68fdb2db2f Merge branch 'cassandra-2.1' into trunk 2014-11-20 14:32:08 -06:00
Brandon Williams 705e5e47d1 bump python version to 2.7 2014-11-20 14:31:59 -06:00
Jake Luciani 19c2d22e93 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	NEWS.txt
	build.xml
2014-11-05 16:04:24 -05:00
Jake Luciani 44e9f23d4f Prep for 2.1.2 2014-11-05 15:56:15 -05:00
Jake Luciani 4fd3349e2e Merge branch 'cassandra-2.1' into trunk
Conflicts:
	build.xml
2014-11-05 15:44:03 -05:00
Jake Luciani 4f863be3f7 Fix Cassandra crash when running on JDK8 update 40
Patch by Michael Schuler; reviewed by Robert Stupp (CASSANDRA-8209)
2014-11-05 15:28:24 -05:00
Brandon Williams 60c0cad17a Merge branch 'cassandra-2.1' into trunk 2014-10-23 11:57:20 -05:00
Brandon Williams 0126760f6d Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
2014-10-23 11:57:00 -05:00
Sylvain Lebresne 02b83d9a8c Update versions for 2.0.11 2014-10-21 16:23:52 +02:00
Brandon Williams b6b08f281b Merge branch 'cassandra-2.1' into trunk 2014-10-17 15:14:21 -05:00
Sylvain Lebresne 8fca88e306 Update news/version for 2.1.1 2014-10-17 13:45:08 +02:00
Joshua McKenzie 861c4cf2de Integrate Sigar library and add basic OS performance checks on startup
Patch by Amit Kumar and Josh McKenzie; reviewed by tjake for (CASSANDRA-7838)
2014-10-09 12:32:57 -04:00
Brandon Williams ba6bc8dd35 Merge branch 'cassandra-2.1' into trunk 2014-10-03 12:37:39 -05:00
Brandon Williams 4539237ab6 Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	debian/rules
2014-10-03 12:37:28 -05:00
Brandon Williams 8952d6ca92 Set base C* version in debs and strip -N, ~textN, +textN
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-8046
2014-10-03 12:36:44 -05:00
Brandon Williams 1f10bcbbbb Add bash-completion to debian/control Build-Depends
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-8040
2014-10-02 13:34:47 -05:00
Brandon Williams 116d05b3e3 Merge branch 'cassandra-2.1' into trunk 2014-10-02 13:34:20 -05:00
Brandon Williams f1847a78c7 Add bash-completion to debian/control Build-Depends
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-8040
2014-10-02 13:33:27 -05:00
Aleksey Yeschenko 380273826d Remove cassandra-cli
patch by Aleksey Yeschenko; reviewed by Brandon Williams and Jason Brown
for CASSANDRA-7920
2014-09-24 18:33:29 -07:00
Jake Luciani 192468f7a2 Ninja fix debian rules to handle versions with -N package convention 2014-09-22 15:32:36 -04:00
Brandon Williams 3909567da6 Fix logging dir in debian package
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-7941
2014-09-15 20:15:21 +00:00
Brandon Williams 23b957c5aa Merge branch 'cassandra-2.0' into cassandra-2.1 2014-09-12 13:14:57 -05:00
Brandon Williams 6c6c723b9c Allow pid file to be read by mere mortals.
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-7851
2014-09-12 13:14:04 -05:00
Sylvain Lebresne c6a2c65a75 Update versions and NEWS file for 2.1.0 release 2014-09-07 15:25:31 +02:00
Sylvain Lebresne 35e4e77071 Update version number for 2.1.0-rc7 2014-08-28 16:33:05 +02:00
Brandon Williams 4dc3a6e38c Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
	debian/init
2014-08-26 10:39:59 -05:00
Brandon Williams 6b7697589d Export JVM_OPTS in debian init
Patch by Matt Robenolt, reviewed by Michael Shuler for CASSANDRA-7802
2014-08-26 10:33:45 -05:00