natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,804 Commits 17 Branches 338 Tags 665 MiB
Commit Graph

10027 Commits

Author SHA1 Message Date
Brandon Williams 0b89ae2601 Merge branch 'cassandra-2.1' into trunk 2014-07-10 12:10:56 -05:00
Brandon Williams 6cc03b9606 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-10 12:10:44 -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
Benedict Elliott Smith ac4a0263fe Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	test/unit/org/apache/cassandra/db/CommitLogTest.java
 2014-07-10 10:01:19 +01:00
Benedict Elliott Smith 581ce63102 Fail to start if commit log replay encounters an exception 
patch by Benedict; reviewed by Vijay
 2014-07-10 09:58:52 +01:00
Josh McKenzie ae03e1bab7 Fix race condition during pending range calculation 
Patch by Josh McKenzie; reviewed by Tyler Hobbs for CASSANDRA-7390
 2014-07-09 15:51:51 -05:00
Sylvain Lebresne 304ead14ed Merge branch 'cassandra-2.1' into trunk 2014-07-09 18:23:26 +02:00
Sylvain Lebresne 898425783f Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-09 18:23:02 +02: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 23b0224751 Merge branch 'cassandra-2.1' into trunk 2014-07-08 16:23:11 -07:00
Jason Brown b9d2684a89 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-08 16:22:26 -07: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
Aleksey Yeschenko 111f0c0f91 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	debian/changelog
 2014-07-08 20:21:26 +03:00
Aleksey Yeschenko 04944f0ca9 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-08 20:18:24 +03:00
Brandon Williams d5265bb326 fix nodetool alignment 2014-07-08 12:17:13 -05:00
Sylvain Lebresne 8733de6440 Followup for CASSANDRA-7403 2014-07-08 14:00:35 +02:00
Benedict Elliott Smith e58f379ca0 Merge branch 'cassandra-2.1' into trunk 2014-07-07 21:13:03 +01:00
Benedict Elliott Smith ec38458d6f Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-07 21:12:57 +01: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 047c04611b Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	tools/stress/src/org/apache/cassandra/stress/Operation.java
	tools/stress/src/org/apache/cassandra/stress/operations/CqlIndexedRangeSlicer.java
	tools/stress/src/org/apache/cassandra/stress/operations/CqlRangeSlicer.java
	tools/stress/src/org/apache/cassandra/stress/operations/ThriftInserter.java
	tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlCounterAdder.java
	tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlCounterGetter.java
	tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlInserter.java
	tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java
	tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlReader.java
	tools/stress/src/org/apache/cassandra/stress/settings/SettingsColumn.java
 2014-07-07 18:34:02 +01:00
Benedict Elliott Smith 35b88c560f Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-07 18:25:27 +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
Yuki Morishita 871de53a83 Update SSTable decriptor version for 3.0 2014-07-07 11:11:22 -05:00
Sylvain Lebresne e28cc6354e Merge branch 'cassandra-2.1' into trunk 2014-07-07 18:06:31 +02:00
Sylvain Lebresne 59a8504c34 Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-07-07 18:06:04 +02:00
Yuki Morishita d13a996e45 Shorten SSTable path 
patch by yukim; reviewed by Josh McKenzie for CASSANDRA-6962
 2014-07-07 10:53:01 -05: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 0ae5def831 Merge branch 'cassandra-2.1' into trunk 2014-07-07 06:35:25 -07:00
Jason Brown 0b54c4e500 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-07 06:34:56 -07: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 968810e50f Merge branch 'cassandra-2.1' into trunk 2014-07-07 00:13:57 -05:00
Jonathan Ellis aac8e6c7f0 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-07 00:13:50 -05:00
Jonathan Ellis 48ff36a457 Fix ClassCastException processing expired messages 
patch by Jason Brown; reviewed by tjake for CASSANDRA-7496
 2014-07-07 00:03:18 -05:00
Jonathan Ellis 7161feddb9 Merge branch 'cassandra-2.1' into trunk 2014-07-06 23:56:05 -05:00
Jonathan Ellis afe502474f Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-06 23:55:46 -05:00
Jonathan Ellis 9b539f966f Fix prepared marker for collections inside UDT 
patch by slebresne; reviewed by thobbs for CASSANDRA-7472
 2014-07-06 23:55:32 -05:00
Aleksey Yeschenko f20b097821 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	doc/cql/CQL.textile
	src/java/org/apache/cassandra/cql/CFPropDefs.java
 2014-07-03 21:41:28 +03:00
Aleksey Yeschenko 3be63ddadd Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-03 21:37:24 +03:00
Aleksey Yeschenko 92cb551ae3 Remove left-over populate_io_cache_on_flush and replicate_on_write uses 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for CASSANDRA-7493
 2014-07-03 21:35:39 +03:00
Marcus Eriksson 4ea742cd0a Merge branch 'cassandra-2.1' into trunk 2014-07-03 18:43:18 +02:00
Marcus Eriksson 9a6cdf1481 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-03 18:43:09 +02:00
Marcus Eriksson 28164849cc Remove left-over rows_per_partition_to_cache 
Patch by marcuse; reviewed by jbellis for CASSANDRA-7493
 2014-07-03 18:42:51 +02:00
Marcus Eriksson 72c08f11a2 Merge branch 'cassandra-2.1' into trunk 2014-07-03 14:29:59 +02:00
Marcus Eriksson a0bfdebcaa Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-03 14:29:45 +02:00
Marcus Eriksson 8c4ffbe657 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
	NEWS.txt
	src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
 2014-07-03 14:29:31 +02:00
Marcus Eriksson f39cb073ac Add property to disable stcs in L0 
Patch by marcuse; reviewed by tjake for CASSANDRA-6621
 2014-07-03 14:19:50 +02:00
Jason Brown c58b2b28e7 Merge branch 'cassandra-2.1' into trunk 2014-07-02 16:03:31 -07:00