Commit Graph

21803 Commits

Author SHA1 Message Date
Marcus Eriksson 2931a1938d Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-13 15:08:58 +02:00
Marcus Eriksson 7a274dd36c Merge branch 'cassandra-2.2' into cassandra-3.0 2016-10-13 15:03:00 +02:00
Joel Knighton 7232d72c0f Limit colUpdateTimeDelta histogram updates to reasonable deltas
patch by Joel Knighton; reviewed by Marcus Eriksson for CASSANDRA-11117
2016-10-13 15:01:29 +02:00
Stefania Alborghetti a0419085d5 cqlsh fails to format collections when using aliases
Patch by Stefania Alborghetti; reviewed by Robert Stupp for CASSANDRA-11534
2016-10-13 09:26:16 +08:00
Carl Yeksigian 541d837070 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-12 12:30:11 -04:00
Carl Yeksigian 76f1750285 Split materialized view mutations on build to prevent OOM
Patch by Carl Yeksigian; reviewed by Jake Luciani for CASSANDRA-12268
2016-10-12 12:24:19 -04:00
Robert Stupp f1b742e9df Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-12 13:45:21 +02:00
Robert Stupp d5f2d0f07f mx4j does not work in 3.0.8
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-12274
2016-10-12 13:43:03 +02:00
Jeff Jirsa b25d9030a8 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-11 21:27:09 -07:00
Jeff Jirsa 703b151b15 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-10-11 21:25:33 -07:00
Jeff Jirsa ff5c497d1f CASSANDRA-12700: Better handle invalid system roles table
Patch by Jeff Jirsa; Reviewed by Sam Tunnicliffe for CASSANDRA-12700
2016-10-11 21:23:05 -07:00
Stefania Alborghetti f9ae1b7c61 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-12 09:50:46 +08:00
Stefania Alborghetti 74f1e0aaa8 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-10-12 09:49:11 +08:00
Stefania Alborghetti 73b888db1a ninja: fixed typo in CHANGES.txt for CASSANDRA-12642 2016-10-12 09:48:36 +08:00
Jeremiah D Jordan c7fb95c98d Check for hash conflicts in prepared statements.
Patch by Jeremiah Jordan; reviewed by Alex Petrov for CASSANDRA-12733
2016-10-11 14:33:05 +01:00
Berenguer Blasi 830954304e Exit query parsing upon first error
patch by Berenguer Blasi; reviewed by Benjamin Lerer for CASSANDRA-12598
2016-10-11 10:50:01 +02:00
Stefania Alborghetti e0a35e5852 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-11 11:26:24 +08:00
Stefania Alborghetti 72c9eb2dc6 Abort cqlsh copy-from in case of no answer after prolonged period of time
Patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-12740
2016-10-11 11:25:03 +08:00
Michael Shuler 3003d21a95 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-10 17:11:15 -05:00
Michael Shuler 84552867b2 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-10-10 17:10:44 -05:00
Michael Shuler c5fdb32cee Merge branch 'cassandra-2.1' into cassandra-2.2 2016-10-10 17:10:10 -05:00
Michael Shuler 83ae5f3398 Bump version to 2.1.17 2016-10-10 17:09:10 -05:00
Guy Bolton King cbc792531f Show the correct value for JMX port in cassandra-stress settings
Patch by Guy Bolton King; reviewed by tjake for CASSANDRA-12759
2016-10-10 09:54:14 -04:00
T Jake Luciani 1bc736d935 Fix cassandra-stress to Use single seed in UUID generation
Patch by Chris Splinter; reviewed by tjake for CASSANDRA-12729
2016-10-10 09:50:29 -04:00
Stefania Alborghetti 37551e99e5 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-10 09:52:42 +08:00
Stefania Alborghetti 2f0e365dc4 Avoid sstable corrupt exception due to dropped static column
Patch by Stefania Alborghetti; reviewed by Carl Yeksigian for CASSANDRA-12582
2016-10-10 09:50:30 +08:00
Stefania Alborghetti e930ffa8a0 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-10 09:42:31 +08:00
mck e9ea5e0a28 CompressedRandomAccessReaderTest.testDataCorruptionDetection fails sporadically
Patch by Blake Eggleston; reviewed by Caleb Rackliffe for CASSANDRA-12552
2016-10-08 22:51:32 +11:00
Stefania Alborghetti 316e1cd7b4 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-07 16:54:26 +08:00
Stefania Alborghetti 695065e27a Merge branch 'cassandra-2.2' into cassandra-3.0 2016-10-07 16:52:01 +08:00
Stefania Alborghetti be6e6ea662 Fix leak errors and execution rejected exceptions when draining
Patch by Stefania Alborghetti; reviewed by Marcus Eriksson for CASSANDRA-12457
2016-10-07 16:49:00 +08:00
Alex Petrov 47c473ae3c CQLSSTableWriter does not allow Update statement
Patch by Alex Petrov; reviewed by Stefania Alborghetti for CASSANDRA-12450
2016-10-07 12:11:32 +08:00
Michael Shuler 6216ce8794 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-05 17:22:19 -05:00
Michael Shuler 45d0176290 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-10-05 17:21:11 -05:00
Michael Shuler 975284cd57 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-10-05 17:20:44 -05:00
Michael Shuler 87034cd059 Prepare 2.1.16 release 2016-10-05 17:18:52 -05:00
Robert Stupp b3a4e2005e Config class uses boxed types but DD exposes primitive types
patch by Robert Stupp; reviewed by Carl Yeksigian for CASSANDRA-12199
2016-10-05 09:39:03 +02:00
Anthony Cozzie 9fd0d0747b Add pre- and post-shutdown hooks to Storage Service
Patch by Anthony Cozzie; reviewed by Alex Petrov for CASSANDRA-12461
2016-10-05 09:35:53 +08:00
Aleksey Yeschenko 8c95d376dc Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-04 16:22:06 +01:00
Denis Ranger db869bc774 Make stress use client mode to avoid checking commit log size on startup
Patch by Denis Ranger; Reviewed by Paulo Motta for CASSANDRA-12478
2016-10-04 16:10:52 +01:00
Aleksey Yeschenko af60ca9b75 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-04 14:37:25 +01:00
Dikang Gu 85ac06c640 Fix exceptions with new vnode allocation
Patch by Dikang Gu; reviewed by Branimir Lambov for CASSANDRA-12715
2016-10-04 14:36:35 +01:00
Dikang Gu 0ac1079a4b Add hint delivery metrics
patch by Dikang Gu and Aleksey Yeschenko for CASSANDRA-12693
2016-10-04 14:31:17 +01:00
Yasuharu Goto 033f2565ef Remove IndexInfo cache from FileIndexInfoRetriever
patch by Yasuharu Goto; reviewed by Robert Stupp for CASSANDRA-12731
2016-10-04 14:40:43 +02:00
Yasuharu Goto 433dd1c0ab IllegalArgumentException in CompactionTask
patch by Yasuharu Goto; reviewed by Robert Stupp for CASSANDRA-12717
2016-10-04 13:39:42 +02:00
Robert Stupp c2106e1451 ColumnIndex does not reuse buffer
patch by Robert Stupp; reviewed by Branimir Lambov for CASSANDRA-12502
2016-10-04 13:28:06 +02:00
Stefania Alborghetti 2e18adf257 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-04 09:54:18 +08:00
Alex Petrov 5115c106db Unify drain and shutdown processes
Patch by Alex Petrov; reviewed by Stefania Alborghetti for CASSANDRA-12509
2016-10-04 09:51:51 +08:00
Stefania Alborghetti c089b26976 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-04 09:17:25 +08:00
Stefania Alborghetti 79a16e5e97 Fix NPE in ComponentOfSlice.isEQ()
Patch by Stefania Alborghetti; reviewed by Swen Moczarski for CASSANDRA-12706
2016-10-04 09:09:46 +08:00