Commit Graph

18889 Commits

Author SHA1 Message Date
Robert Stupp fb9e75eb32 Merge branch 'cassandra-3.0' into trunk 2015-11-06 18:28:51 +01:00
Robert Stupp e94032a234 Store UDA initcond as CQL literal in the schema table, instead of a blob
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-10650
2015-11-06 18:28:48 +01:00
Aleksey Yeschenko d91fb581ee Merge branch 'cassandra-3.0' into trunk 2015-11-06 15:26:44 +00:00
Aleksey Yeschenko cfbe2d35b0 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-06 15:26:14 +00:00
Aleksey Yeschenko edca4dcecc Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-06 15:25:53 +00:00
Stefania Alborghetti 81e520c54b (cqlsh) fix COPY using wrong variable name for time_format
patch by Stefania Alborghetti; reviewed by Paulo Motta for
CASSANDRA-10633
2015-11-06 15:22:42 +00:00
Sylvain Lebresne 9084428782 Merge branch 'cassandra-3.0' into trunk 2015-11-06 15:03:52 +01:00
Sylvain Lebresne 5343a75bf5 Don't use -1 as position for partition key in schema
patch by slebresne; reviewed by beobal for CASSANDRA-10491
2015-11-06 15:00:20 +01:00
Robert Stupp 155859641a Merge branch 'cassandra-3.0' into trunk 2015-11-06 14:56:45 +01:00
Robert Stupp 0b83c188b9 Make UFTest.testAmokUDF non-flappy
patch by Robert Stupp; reviewed by Sylvain Lebresne for CASSANDRA-10662
2015-11-06 14:56:26 +01:00
Sylvain Lebresne a177502b8f Merge branch 'cassandra-3.0' into trunk 2015-11-06 14:52:40 +01:00
Sylvain Lebresne 57d56bd1c2 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-06 14:52:23 +01:00
Sylvain Lebresne 6367987f49 Always update system keyspace to the most up-to-date version
patch by slebresne; reviewed by carlyeks for CASSANDRA-10652
2015-11-06 14:42:31 +01:00
Sylvain Lebresne 5c97de91bb Merge branch 'cassandra-3.0' into trunk 2015-11-06 12:14:14 +01:00
Benjamin Lerer 962aa2b5cc Fix distinct queries in mixed version clusters
patch by blerer; reviewed by slebresne for CASSANDRA-10573
2015-11-06 12:13:49 +01:00
Aleksey Yeschenko 2f7bab9954 Merge branch 'cassandra-3.0' into trunk 2015-11-06 11:02:23 +00:00
Aleksey Yeschenko dc7e8405bd Correct IRE message in DropTypeStatement::validate 2015-11-06 11:01:55 +00:00
Sylvain Lebresne 9280273f72 Merge branch 'cassandra-3.0' into trunk 2015-11-06 11:54:37 +01:00
Sylvain Lebresne 1e4d44e18e Skip sstable base on clustering in names query
patch by slebresne; reviewed by iamaleksey for CASSANDRA-10571
2015-11-06 11:53:32 +01:00
Sylvain Lebresne 943294ba29 Merge branch 'cassandra-3.0' into trunk 2015-11-06 10:55:03 +01:00
Sylvain Lebresne 925336031a Disable value skipping as that breaks read-repair currently
patch by slebresne; reviewed by beobal for CASSANDRA-10655
2015-11-06 10:53:55 +01:00
Aleksey Yeschenko 8f189d1107 Merge branch 'cassandra-3.0' into trunk 2015-11-06 00:13:40 +00:00
Aleksey Yeschenko cc4d759c90 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-06 00:12:29 +00:00
Aleksey Yeschenko 801c50e69f Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-06 00:10:09 +00:00
Paulo Motta 2ca7599023 Do not run SizeEstimatesRecorder if a node is not a member of the ring
patch by Paulo Motta; reviewed by Joel Knighton for CASSANDRA-9912
2015-11-06 00:00:38 +00:00
Aleksey Yeschenko 746e9e4196 Merge branch 'cassandra-3.0' into trunk 2015-11-05 23:46:42 +00:00
Joel Knighton 02a53fa2b7 Fix bootstrapping with MVs
patch by Joel Knighton; reviewed by Carl Yeksigian for CASSANDRA-10621
2015-11-05 23:43:16 +00:00
Aleksey Yeschenko d128103b3d Merge branch 'cassandra-3.0' into trunk 2015-11-05 23:22:34 +00:00
Carl Yeksigian f3eb4ce40b Make sure EACH_QUORUM reads are using NTS
patch by Carl Yeksigian; reviewed by Ariel Weisberg for CASSANDRA-10584
2015-11-05 23:16:33 +00:00
Aleksey Yeschenko bc674c1c88 Merge branch 'cassandra-3.0' into trunk 2015-11-05 23:04:53 +00:00
Joel Knighton 1bd2c94252 Fix MV replica filtering for non-NetworkTopologyStrategy
patch by Joel Knighton; reviewed by Carl Yeksigian for CASSANDRA-10634
2015-11-05 23:04:20 +00:00
Russ Hatch c3678f6b64 Add ant target for running a list of test classes
patch by Russ Hatch; reviewed by Ariel Weisberg for CASSANDRA-10651
2015-11-05 22:55:45 +00:00
Aleksey Yeschenko e8e90406f8 Merge branch 'cassandra-3.0' into trunk 2015-11-05 22:52:39 +00:00
Aleksey Yeschenko 4db577abf8 Fix NativeSSTableLoaderClient to use the right ClusteringOrder class 2015-11-05 22:52:23 +00:00
Aleksey Yeschenko 718c4789c9 Merge branch 'cassandra-3.0' into trunk 2015-11-05 22:32:34 +00:00
Mike Adamson 9c9f263822 (Hadoop) fix CIF describeSplits() not handling 0 size estimates
patch by Mike Adamson; reviewed by Paulo Motta for CASSANDRA-10600
2015-11-05 22:31:29 +00:00
Robert Stupp a38f362a04 Merge branch 'cassandra-3.0' into trunk 2015-11-05 18:42:13 +01:00
Robert Stupp 5289a564cf Fix failing DeleteTest
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-10656
2015-11-05 18:42:02 +01:00
Aleksey Yeschenko c42fcf5709 Merge branch 'cassandra-3.0' into trunk 2015-11-05 14:35:34 +00:00
Paulo Motta 9940892c3c Fix cqlsh type handling after driver metadata api change
patch by Paulo Motta; reviewed by Aleksey Yeschenko
2015-11-05 14:35:01 +00:00
Aleksey Yeschenko 2a4b8f10e9 Merge branch 'cassandra-3.0' into trunk 2015-11-05 13:03:16 +00:00
Aleksey Yeschenko 454f32dcb6 Fix NativeSSTableLoaderClient post CASSANDRA-10365 2015-11-05 13:02:03 +00:00
Aleksey Yeschenko 4effabc8fe Merge branch 'cassandra-3.0' into trunk 2015-11-05 11:20:06 +00:00
Aleksey Yeschenko 18e2fca8b4 Fix handling counters in supercolumns when parsing schema
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10365
2015-11-05 11:18:38 +00:00
Sylvain Lebresne 65000b3c2d Merge branch 'cassandra-3.0' into trunk 2015-11-05 11:16:05 +01:00
Sylvain Lebresne 4a00438a27 Don't account for unconsumed data when checking if past sstable index
patch by slebresne; reviewed by blambov for CASSANDRA-10590
2015-11-05 11:07:09 +01:00
Robert Stupp be2cf1afa7 Merge branch 'cassandra-3.0' into trunk 2015-11-04 23:30:01 +01:00
Robert Stupp 242b9738f2 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-04 23:29:44 +01:00
Robert Stupp 0ff13d2a68 get JEMAlloc debug output out of nodetool output
patch by Robert Stupp; reviewed by Ariel Weisberg for CASSANDRA-10628
2015-11-04 23:28:57 +01:00
Aleksey Yeschenko 1b876bc600 Merge branch 'cassandra-3.0' into trunk 2015-11-04 17:08:43 +00:00