Commit Graph

23258 Commits

Author SHA1 Message Date
Mick Semb Wever 8c38b20343
Merge branch 'cassandra-3.0' into cassandra-3.11 2019-04-10 21:14:31 +10:00
Zhao Yang 4a70a9a982
support frozen collections: list, set in cassandra-stress
patch by ZhaoYang ; reviewed by Mick Semb Wever for CASSANDRA-14907
2019-04-10 21:12:53 +10:00
Mick Semb Wever a82603a4e7
Merge branch 'cassandra-3.0' into cassandra-3.11 2019-04-07 14:23:00 +10:00
Brandon Williams 7a058c6b03
For nodetool listsnapshots output, put spaces between columns, and increase snapshot padding.
patch by Aleksandr Sorokoumov and Brandon Williams; reviewed by Mick Semb Wever for CASSANDRA-14876
2019-04-07 13:54:43 +10:00
Mick Semb Wever 8ac2e4244d
Merge branch 'cassandra-3.0' into cassandra-3.11 2019-04-01 20:47:14 +11:00
Mick Semb Wever 47910df834
Merge branch 'cassandra-2.2' into cassandra-3.0 2019-04-01 20:46:17 +11:00
Mick Semb Wever 6fc3df93b8
Update comment link to mx4j in cassandra-env.sh
patch by Jearvon Dharrie; reviewed by Mick Semb Wever for CASSANDRA-14950
2019-04-01 20:40:19 +11:00
Aleksey Yeschenko 11524170cb Merge branch 'cassandra-3.0' into cassandra-3.11 2019-03-27 14:43:17 +00:00
Jeff Jirsa ba32595546 Fix handling FS errors on writing and reading flat files - LogTransaction and hints
patch by Jeff Jirsa; reviewed by Ariel Weisberg, Blake Eggleston, and
Marcus Eriksson for CASSANDRA-15053
2019-03-27 14:33:51 +00:00
Marcus Eriksson 08018ab5c1 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-03-26 10:07:27 +01:00
Marcus Eriksson b48ba8a843 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-03-26 10:03:26 +01:00
Marcus Eriksson 1d615a5ca1 Fix index summary redistribution cancellation
Patch by marcuse; reviewed by Jordan West for CASSANDRA-15045
2019-03-26 10:00:22 +01:00
Marcus Eriksson 9d7eeb5d28 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-03-25 09:05:22 +01:00
Marcus Eriksson 78776d3534 Avoid double closing the iterator to avoid overcounting the number of requests
Patch by marcuse; reviewed by Sam Tunnicliffe for CASSANDRA-15058
2019-03-25 09:02:43 +01:00
Marcus Eriksson 0c2d99244d Merge branch 'cassandra-3.0' into cassandra-3.11 2019-03-15 09:56:16 +00:00
Marcus Eriksson 7bda2a0619 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-03-15 09:52:43 +00:00
Stefan Podkowinski 7333c2b04d Refactor Circle CI configuration
Enable high resource settings by copying .circleci/config.yml.HIGHRES
to .circleci/config.yml. For more details, see .circleci/readme.md

Patch by Stefan Podkowinski; reviewed by marcuse for CASSANDRA-14806
2019-03-15 09:47:27 +00:00
Mick Semb Wever 84fc68ce3f
Fix copyright years in generated apidocs and in the NOTICE file
Patch by Bernhard M. Wiedemann; reviewed by Mick Semb Wever for CASSANDRA-15039
2019-03-08 19:51:10 +11:00
Joseph Lynch 036fff3937 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-03-05 16:06:19 -08:00
Joseph Lynch 67d613204f ninja fix: Remove unnecessary CHANGES.txt entry from CASSANDRA-15012 2019-03-05 16:05:13 -08:00
Vinay Chella 555c6d26e1 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-03-05 15:38:52 -08:00
Vinay Chella 2cd4500990 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-03-05 15:36:32 -08:00
C. Scott Andreas 53db417b3c Fixing invalid CQL in security documentation
Patch by C. Scott Andreas; reviewed by Vinay Chella for CASSANDRA-15020
2019-03-05 15:30:24 -08:00
Joseph Lynch b780f62486 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-03-05 13:40:30 -08:00
Joseph Lynch 64ebd88213 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-03-05 13:37:39 -08:00
Joseph Lynch 595da9c12e Make tools/bin/token-generator py2/3 compatible
Patch by Joseph Lynch; reviewed by Stefan Podkowinski for CASSANDRA-15012
2019-03-05 13:34:49 -08:00
Alex Petrov 093fe7dfe9 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-02-25 16:30:36 +01:00
Alex Petrov 127cf8ffbf Merge branch 'cassandra-2.2' into cassandra-3.0 2019-02-25 16:29:14 +01:00
Alex Petrov e0c10fd76b Implement simple In-JVM tooling for testing distributed paging
Patch by Alex Petrov; reviewed by Jon Meredith for CASSANDRA-15009
2019-02-25 16:27:46 +01:00
Alex Petrov 7b462ec467 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-02-25 14:16:19 +01:00
Alex Petrov b27cc37abd Merge branch 'cassandra-2.2' into cassandra-3.0 2019-02-25 14:14:19 +01:00
Alex Petrov a7d8ba7b10 Fix memory-retention problem arising from thread locals from schema change in in-jvm tests
patch by Alex Petrov; reviewed by Joseph Lynch for CASSANDRA-15014
2019-02-25 14:00:16 +01:00
Jeff Jirsa a621972a1a Merge branch 'cassandra-3.0' into cassandra-3.11 2019-02-24 20:50:44 -08:00
Jeff Jirsa 4bb4e6054b Ninja: Fix string format arguments for dropped columns 2019-02-24 20:49:40 -08:00
Andrés de la Peña e6a61be8c8 Add flag to disable SASI indexes, and warning on creation
patch by Andres de la Peña; reviewed by Robert Stupp for CASSANDRA-14866
2019-02-19 14:20:06 +00:00
Aleksey Yeshchenko b9b2e8e574 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-02-15 09:41:18 +00:00
Fumiya Yamashita d7d00036e7 Improve `nodetool status -r` speed
patch by Fumiya Yamashita; reviewed by Dinesh Joshi for CASSANDRA-14847

Co-authored-by: Fumiya Yamashita <fyamashi@yahoo-corp.jp>
Co-authored-by: Dinesh A. Joshi <dinesh.joshi@apple.com>
2019-02-15 09:38:10 +00:00
Blake Eggleston 126853068d Merge branch 'cassandra-3.0' into cassandra-3.11 2019-02-14 13:21:38 -08:00
Joseph Lynch b30c8c98a5 Improve merkle tree size and time on heap
Patch by Joseph Lynch; Reviewed by Blake Eggleston for CASSANDRA-14096
2019-02-14 13:19:30 -08: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 a77f978a08 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-02-11 21:09:50 -06:00
Michael Shuler 229f8b3a44 Update version to 3.0.19 2019-02-11 21:09:23 -06:00
Michael Shuler d109e5cd2b Merge branch 'cassandra-2.2' into cassandra-3.0 2019-02-11 21:02:38 -06:00
Michael Shuler ce6bcaa5b8 Update version to 2.2.15 2019-02-11 21:01:30 -06:00
Benedict Elliott Smith 9199e591c6 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-02-06 13:49:01 +00:00
Benedict Elliott Smith 44785dd2ee Anti-compaction temporarily corrupts sstable state
This may result in queries being answered with incorrect results.

patch by Blake Eggleston, Marcus Eriksson and Benedict for CASSANDRA-15004

Co-authored-by: Marcus Eriksson <marcuse@apache.org>
Co-authored-by: Blake Eggleston <bdeggleston@gmail.com>
2019-02-06 13:39:32 +00:00
Benedict Elliott Smith a6059f1fee Merge branch 'cassandra-3.0' into cassandra-3.11 2019-02-05 10:52:17 +00:00
Benedict Elliott Smith aa2a5c6994 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-02-05 10:51:28 +00:00