Commit Graph

21803 Commits

Author SHA1 Message Date
Ben Slater 7c759e2c32 Add sequence distribution type to cassandra stress: fix problem with setSeed()
Patch by Ben Slater; reviewed by Stefania Alborghetti for CASSANDRA-12490
2016-10-24 11:09:04 +08:00
Jeff Jirsa d4a914d216 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-21 19:04:40 -07:00
Jeff Jirsa 5883e43587 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-10-21 19:03:44 -07:00
Jeff Jirsa 28713778ab Split consistent range movement flag correction
Patch by Sankalp Kohli; Reviewed by Jeff Jirsa for CASSANDRA-12786
2016-10-21 19:01:27 -07:00
Marcus Eriksson 575927b1e6 Merge branch 'cameron/12765-3.0' into cameron/12765-3.X 2016-10-21 09:03:31 +02:00
Marcus Eriksson 7976d65af2 Merge branch 'cameron/12765-2.2' into cameron/12765-3.0 2016-10-21 08:55:20 +02:00
Marcus Eriksson a370409c80 Merge branch 'cameron/12765-2.1' into cameron/12765-2.2 2016-10-21 08:40:20 +02:00
Cameron Zemek f7ded1c592 Don't skip sstables based on maxLocalDeletionTime
Patch by Cameron Zemek; reviewed by marcuse for CASSANDRA-12765
2016-10-21 08:38:40 +02:00
Nate McCall f51ee61f9d ninja fix to remove double param in logging msg from merge 2016-10-21 15:34:40 +13:00
Nate McCall ddb3e6a734 Include SSTable path in compacting large row message
Patch by Sankalp Kohli; Reviewed by Nate McCall for CASSANDRA-12384
2016-10-21 15:13:00 +13:00
Nate McCall 8b04ec9088 Include SSTable path in compacting large row message
Patch by Sankalp Kohli; Reviewed by Nate McCall for CASSANDRA-12384
2016-10-21 15:00:50 +13:00
Stefania Alborghetti e6d22da918 Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster
Patch by Stefania Alborghetti; reviewed by Branimir Lambov for CASSANDRA-12812
2016-10-21 09:18:12 +08:00
Yuki Morishita 26ee16b5f7 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-20 10:38:59 -05:00
Yuki Morishita 4ba91cdadd eclipse-warning fix 2016-10-20 10:38:53 -05:00
Benjamin Lerer af1afef564 Upgrade commons-codec to 1.9
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko  for CASSANDRA-12790
2016-10-20 17:21:02 +02:00
Yuki Morishita 78f1807143 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-20 09:47:36 -05:00
Arunkumar M 83cc2ed3af Fix unreleased resource sockets
patch by Arunkumar M; reviewed by yukim for CASSANDRA-12330
2016-10-20 09:46:55 -05:00
Yuki Morishita 23bfcabfb3 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-20 09:45:28 -05:00
Arunkumar M 86a73d439c Fix unreleased resource sockets
patch by Arunkumar M; reviewed by yukim for CASSANDRA-12329
2016-10-20 09:44:23 -05:00
Jeff Jirsa d8c836653b Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-19 21:02:17 -07:00
Amit Deshpande c9ca441bde Explicitly set locale for string validation
Patch by Amit Deshpande; Reviewed by Jeff Jirsa for CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545
2016-10-19 20:54:08 -07:00
Jeff Jirsa 6130d4b2c5 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-19 20:50:54 -07:00
Amit Deshpande 9b35640957 Explicitly set locale for string validation
Patch by Amit Deshpande; Reviewed by Jeff Jirsa for CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545
2016-10-19 20:41:38 -07:00
Stefania Alborghetti 7886bd38a3 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-20 09:20:54 +08:00
Alex Petrov 55568c17d6 Backport of "Fix test broken after second pass of CASSANDRA-11803 changes" from 3.X to 3.0
Patch by Alex Petrov; reviewed by Carl Yeksigian for CASSANDRA-11803
2016-10-20 09:20:11 +08:00
Alex Petrov 5f2367ef92 Fix test broken after second pass of CASSANDRA-11803 changes
Patch by Alex Petrov; reviewed by Carl Yeksigian for CASSANDRA-11803
2016-10-19 11:08:19 -04:00
Stefania Alborghetti 1f19d1a7bf Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-19 09:46:11 +08:00
Stefania Alborghetti 250b5c1db0 Fix ViewTest.testCompaction
patch by Stefania Alborghetti; reviewed by Marcus Eriksson for CASSANDRA-12789
2016-10-19 09:43:37 +08:00
Jeff Jirsa 72d0c814cf Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-18 18:12:23 -07:00
Jeff Jirsa 7d3062f2d5 Correct log message for statistics of offheap memtable flush
Patch by Kurt Greaves; Reviewed by Jeff Jirsa for CASSANDRA-12776
2016-10-18 18:10:37 -07:00
Christopher Batey 3bf043e4e4 Record CAS contention for write timeouts in prepare phase
Patch by Christopher Batey; Reviewed by Edward Capriolo for CASSANDRA-12626
2016-10-18 17:27:42 -07:00
Marcus Eriksson 747a62f607 Merge branch 'cassandra-3.X' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-3.X 2016-10-18 14:10:34 +02:00
Benjamin Lerer ecf05b8826 Add duration data type
patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-11873
2016-10-18 14:01:05 +02:00
Dikang Gu 9fc14bc5a5 Make the fanout size for LeveledCompactionStrategy to be configurable
Patch by Dikang Gu; reviewed by Marcus Eriksson for CASSANDRA-11550
2016-10-18 08:46:35 +02:00
Stefania Alborghetti c6ec31bada Fix timeout in ReplicationAwareTokenAllocatorTest
patch by Stefania Alborghetti; reviewed by Branimir Lambov for CASSANDRA-12784
2016-10-18 09:08:56 +08:00
Michael Shuler 7a5118c7de Fix broken clean target in doc/Makefile 2016-10-17 16:19:52 -05:00
Carl Yeksigian f5bc3784fb Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-17 16:16:29 -04:00
Carl Yeksigian bc9a079394 Update reserved keyword list
Patch by Carl Yeksigian; reviewed by Alex Petrov for CASSANDRA-11803
2016-10-17 16:15:49 -04:00
Michael Shuler 720acc611f Add curl key fetch and one-line the example `apt-key adv` key fetch.
Patch by Michael Shuler; reviewed by T Jake Luciani for CASSANDRA-12712
2016-10-17 13:36:42 -05:00
Alex Petrov 04cc3a9309 Improve sum aggregate functions
Patch by Alex Petrov; reviewed by Branimir Lambov for CASSANDRA-12417
2016-10-17 18:28:18 +01:00
Aleksey Yeschenko f5f44f69e4 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-17 18:19:30 +01:00
Alex Petrov 7872318d63 Improve avg aggregate functions
Patch by Alex Petrov; reviewed by Branimir Lambov for CASSANDRA-12417
2016-10-17 18:16:36 +01:00
Guy Bolton King e722046406 Update cassandra.yaml documentation for batch_size thresholds
Take account of changes in CASSANDRA-10876

Patch by Guy Bolton King; reviewed by Joel Knighton for CASSANDRA-12761
2016-10-14 17:14:57 +01:00
Carl Yeksigian 206a7bbac7 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-14 10:28:58 -04:00
Carl Yeksigian 153583be55 Preserve quoted reserved keyword column names in MV creation
Patch by Carl Yeksigian; reviewed by Alex Petrov for CASSANDRA-11803
2016-10-14 10:28:00 -04:00
Sam Tunnicliffe 771a1a2fa2 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-13 17:49:14 +01:00
Sam Tunnicliffe a889852706 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-10-13 17:48:33 +01:00
Sam Tunnicliffe 4eed687d3b Clean up permissions when a UDA is dropped
Patch by Sam Tunnicliffe; reviewed by Joel Knighton for CASSANDRA-12720
2016-10-13 17:46:14 +01:00
Robert Stupp 7234c79bb2 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-13 15:20:20 +02:00
Robert Stupp 6c6407411f nodetool stopdaemon errors out
patch by Robert Stupp; reviewed by Alex Petrov for CASSANDRA-12646
2016-10-13 15:18:56 +02:00