Commit Graph

13106 Commits

Author SHA1 Message Date
Brandon Williams 8fd8832a87 Fix word count
Patch by  Ala' Alkhaldi, reviewed by brandonwilliams for CASSANDRA-7200
2014-07-18 12:35:57 -05:00
Brandon Williams 2215a4fdc2 Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-07-18 12:35:46 -05:00
Brandon Williams bf50717fdf Make cql3 word count executable 2014-07-18 12:34:39 -05:00
Brandon Williams 337e4a8292 Fix word count
Patch by  Ala' Alkhaldi, reviewed by brandonwilliams for CASSANDRA-7200
2014-07-18 12:31:17 -05:00
Brandon Williams 43c2c169b7 fix setlogginglevel help in nodetool 2014-07-17 15:59:05 -05:00
Brandon Williams 5de9c17dd5 Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-07-17 15:49:12 -05:00
Brandon Williams 062addb4c5 fix setlogginglevel help in nodetool 2014-07-17 15:49:01 -05:00
Tyler Hobbs 9c1782d397 Backport CASSANDRA-7454 to 2.1.0 2014-07-17 14:58:09 -05:00
Tyler Hobbs e4b40c75c0 Fix cqlsh authentication with 2.1 python driver
Patch by Mike Adamson; reviewed by Tyler Hobbs for CASSANDRA-7564
2014-07-17 14:43:47 -05:00
Tyler Hobbs 2a661195fe Handle queries on multiple secondary index types
Patch and review by Sam Tunnicliffe and Tyler Hobbs for CASSANDRA-7525
2014-07-16 17:18:46 -05:00
Jonathan Ellis 545e2e1cba Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-07-16 16:17:44 -05:00
Jonathan Ellis 93c27549a3 update column_index_size_in_kb description 2014-07-16 16:17:34 -05:00
Yuki Morishita dc7d5a0a4b Merge branch 'cassandra-1.2' into cassandra-2.0 2014-07-16 15:58:44 -05:00
Yuki Morishita 192596ad75 Fix row size miscalculation in LazilyCompactedRow
when RangeTombstone is involved.
patch by yukim; reviewed by jbellis for CASSANDRA-7543
2014-07-16 15:57:31 -05:00
Tyler Hobbs 6b988fddd0 Ninja: fix grammar for tuple type in CQL docs
Follow up for CASSANDRA-7527
2014-07-16 15:36:58 -05:00
Tyler Hobbs 88e05719b6 Update cqlsh python driver to 2.1
Patch by Mikhail Stepura and Tyler Hobbs; reviewed by Aleksey Yeschenko
for CASSANDRA-7509
2014-07-16 11:56:29 -05:00
Tyler Hobbs 721afaead6 Fix configuration error when running nodetool ring
Patch by Tyler Hobbs; reviewed by Jeremiah Jordan for CASSANDRA-7508
2014-07-15 18:22:26 -05:00
Tyler Hobbs e60b4e6d1d Bump CQL version to 3.2.0 and update CQL docs
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7527
2014-07-15 18:18:15 -05:00
Jonathan Ellis fad5ad5a6a reorder to avoid NPE 2014-07-15 16:19:25 -05:00
Jonathan Ellis 233bd3c034 add cast to float 2014-07-15 15:21:41 -05:00
Jonathan Ellis 3adf59486a memtable_cleanup_threshold and memtable_flush_writers defaults
patch by jbellis; reviewed by bes for CASSANDRA-7551
2014-07-15 15:14:56 -05:00
Tyler Hobbs bd0eafd585 Add missing table name to DROP INDEX responses
Patch and review by Tyler Hobbs and Aleksey Yeschenko for CASSANDRA-7539
2014-07-15 12:23:06 -05:00
Jonathan Ellis 04017616e8 merge from 2.0 2014-07-15 09:57:21 -05:00
Jonathan Ellis 1630ebf6af (Windows) force range-based repair to non-sequential mode
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7541
2014-07-14 11:11:07 -05:00
Jonathan Ellis 9460503713 improve Windows launch scripts
patch by Ala' Alkhaldi and Josh McKenzie for CASSANDRA-7503
2014-07-14 07:48:03 -05:00
Jonathan Ellis 83ac8a631e merge from 2.0 2014-07-11 23:50:46 -05:00
Jonathan Ellis a4544615df Fix range merging when DES scores are zero
patch by thobbs; reviewed by jbellis for CASSANDRA-7535
2014-07-11 23:49:36 -05:00
Brandon Williams 58931dd6fe Make cql3 word count executable 2014-07-11 14:20:57 -05:00
Tyler Hobbs 380583b5e5 Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
	CHANGES.txt
2014-07-10 16:24:03 -05:00
Tyler Hobbs 233308f024 Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
	CHANGES.txt
	NEWS.txt
	build.xml
	debian/changelog
2014-07-10 16:17:39 -05:00
Tyler Hobbs 0d90b03a30 Set stream ID on response for non-Exception Throwables
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7470
2014-07-10 16:11:20 -05:00
Brandon Williams 1a9d4b89d5 Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
	CHANGES.txt
2014-07-10 12:10:32 -05:00
Brandon Williams 11351e3c0d Warn when SSL certs have expired.
Patch by brandonwilliams, reviewed by jasobrown for CASSANDRA-7528
2014-07-10 12:08:58 -05:00
Brandon Williams 420c685114 fix jamm ver in debian 2014-07-10 07:27:06 -05:00
Jake Luciani ae374107b7 ninja fix LegacySSTable test with new versioned files from 2.0 2014-07-09 16:21:36 -04:00
Brandon Williams 0b8fb5bb92 fix missing test build dep for pig-test 2014-07-09 11:50:49 -05:00
Sylvain Lebresne ce46d6619b Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
2014-07-09 18:22:04 +02:00
Sylvain Lebresne 6893130e89 Fix error when doing reverse queries with static columns
patch by graham sanderson; reviewed by slebresne for CASSANDRA-7490
2014-07-09 15:50:17 +02:00
Jason Brown eb4032e5fb Anti-compaction proceeds if any part of the repair failed
patch by jasobrown; reviewed by yukim for CASSANDRA-7521
2014-07-08 16:20:58 -07:00
Jonathan Ellis 895eaecc3d support direct run of .ps1 file w/out batch file
patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7517
2014-07-08 17:51:12 -05:00
Jonathan Ellis c29e48d7ac fix startup when WMI memory query fails
patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7505
2014-07-08 15:58:30 -05:00
Sylvain Lebresne 0bc98414ce Update versions and licenses for 2.1 RC3 release 2014-07-08 14:07:17 +02:00
Sylvain Lebresne 8733de6440 Followup for CASSANDRA-7403 2014-07-08 14:00:35 +02:00
Benedict Elliott Smith 0bc4663aad Consider expiry when reconciling otherwise equal cells
patch by Benedict Elliott Smith; reviewed by Aleksey Yeschenko
and Sylvain Lebresne for CASSANDRA-7403
2014-07-07 21:12:49 +01:00
Benedict Elliott Smith 75364296cb Introduce CQL support for stress tool
patch by Jake Luciani and Benedict Elliott Smith
2014-07-07 18:25:11 +01:00
Sylvain Lebresne 61ee287bc7 Fix test built 2014-07-07 18:16:54 +02:00
Sylvain Lebresne 8d87e0e25e Properly reject unknown UDT fields
patch by slebresne; reviewed by tjake for CASSANDRA-7484
2014-07-07 17:50:26 +02:00
Sylvain Lebresne 0c6fad4a8a Fix error when CONTAINS is used with a bind marker
patch by slebresne; reviewed by tjake for CASSANDRA-7502
2014-07-07 17:31:44 +02:00
Jason Brown cbe4fd02ae ninja fix to lower the logging level of anticompaction when printing ranges 2014-07-07 06:34:00 -07:00
Jonathan Ellis 547cf1d10d merge from 2.0 2014-07-07 00:13:44 -05:00