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

16936 Commits

Author SHA1 Message Date
Sam Tunnicliffe 1936657570 Remove use of Cell in Thrift M/R classes 
Patch and review by Philip Thompson and Sam Tunnicliffe for
CASSANDRA-8609
 2015-06-04 10:46:57 +01:00
Robert Stupp 16b02887df Integrate pre-release Java Driver 2.2-rc1, custom build 
patch by Robert Stupp; reviewed by Ariel Weisberg for CASSANDRA-9493
 2015-06-04 11:17:05 +02:00
Marcus Eriksson 49c31d6837 Make sure repair history actually gets persisted 
Patch by marcuse; reviewed by yukim for CASSANDRA-9534
 2015-06-04 08:28:49 +02:00
Benedict Elliott Smith 49cb12ad13 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java
 2015-06-03 22:55:32 +01:00
Benedict Elliott Smith be3e389586 Replace IndexSummaryManagerTest.testCompactionRace with DataTrackerTest.testCompactOnlyCorrectInstance 
patch by benedict; reviewed by ariel for CASSANDRA-9271
 2015-06-03 22:47:32 +01:00
Jonathan Ellis 4cc5fd10de merge from 2.1 2015-06-03 10:32:01 -07:00
Jonathan Ellis 80ef282570 Default commitlog_sync_batch_window_in_ms changed to 2ms 
patch by jbellis; reveiwed by bes for CASSANDRA-9504
 2015-06-03 10:29:39 -07:00
Benedict Elliott Smith 46ea0402f7 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
 2015-06-03 17:01:59 +01:00
Fabien Rousseau 66a48e7ab1 Fix empty partition assertion in unsorted sstable writing tools 
patch by Fabien Rousseau; reviewed by benedict for CASSANDRA-9071
 2015-06-03 17:00:10 +01:00
T Jake Luciani 2a9fc0e887 make scanner.close idempotent 
Patch by tjake; reviewed by blerer for CASSANDRA-9531
 2015-06-03 10:20:59 -04:00
Sylvain Lebresne 4c53dc3a95 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
 2015-06-03 14:24:41 +02:00
Sylvain Lebresne 655f056987 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/DeletionTime.java
	src/java/org/apache/cassandra/db/RangeTombstone.java
 2015-06-03 14:22:44 +02:00
Sylvain Lebresne b0dbea3dd0 Make sure RangeTombstone.Tracker only keeps the ranges it needs to 
patch by slebresne; reviewed by benedict for CASSANDRA-9486
 2015-06-03 14:14:42 +02:00
Benedict Elliott Smith d5947ee070 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
 2015-06-03 13:11:41 +01:00
Benedict Elliott Smith b9a89a3acc Ensure truncate without snapshot cannot return corrupt responses 
patch by benedict; reviewed by aleksey for CASSANDRA-9388
 2015-06-03 13:11:21 +01:00
stefania 99da210229 Do not reuse cfs in MockSchema 
patch by stefania; reviewed by benedict for CASSANDRA-9537
 2015-06-03 13:07:21 +01:00
Benedict Elliott Smith c1c785593c Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
 2015-06-03 13:03:59 +01:00
Marcus Eriksson 08a5dab008 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-06-03 13:57:14 +02:00
Marcus Eriksson 4bf8076872 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-06-03 13:57:00 +02:00
Stefania Alborghetti 8fcb620d95 Partial backport of CASSANDRA-8739 - avoid LCS overlap in L1 
Patch by Stefania Alborghetti; reviewed by marcuse for CASSANDRA-8656
 2015-06-03 13:48:37 +02:00
Aleksey Yeschenko 9b2c467f24 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-06-03 14:17:07 +03:00
Aleksey Yeschenko a90c80dda6 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-06-03 14:01:30 +03:00
Carl Yeksigian b6a31fb5b9 Add broadcast and rpc addresses to system.local 
patch by Carl Yeksigian; reviewed by Aleksey Yeschenko for
CASSANDRA-9436
 2015-06-03 13:54:59 +03:00
Benedict Elliott Smith 6250065089 Ensure truncate without snapshot cannot return corrupt responses 
patch by benedict; reviewed by aleksey for CASSANDRA-9388
 2015-06-02 18:11:45 +01:00
Marcus Eriksson b2e4d10155 Make it possible to run dc local repairs 
Patch by marcuse; reviewed by yukim for CASSANDRA-9521
 2015-06-02 17:36:42 +02:00
Brandon Williams 4cfb17f48e Merge branch 'cassandra-2.2' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.2 
Conflicts:
	CHANGES.txt
 2015-06-02 08:43:15 -05:00
Brandon Williams 23d7a558ee Clean up gossiper logic for old versions 
Patch by brandonwilliams, reviewed by aleksey for CASSANDRA-9370
 2015-06-02 08:42:28 -05:00
Benjamin Lerer 6f93bd1f65 Fix custom payload encoding decoding to match protocol spec 
patch by blerer; reviewed by slebresne for CASSANDRA-9515
 2015-06-02 15:34:31 +02:00
Sylvain Lebresne a30d8bd212 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
 2015-06-02 14:57:44 +02:00
Sylvain Lebresne c0f96e1d46 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
	test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
 2015-06-02 14:51:20 +02:00
Sylvain Lebresne 9b10928c15 Always mark sstable suspected on corruption 
patch by slebresne; reviewed by benedict for CASSANDRA-9478
 2015-06-02 14:46:09 +02:00
Sam Tunnicliffe 94a68a17c7 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-06-01 18:24:40 +01:00
Sam Tunnicliffe 14a332470c Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2015-06-01 18:12:50 +01:00
Sam Tunnicliffe 63819cbee3 Update CQL docs with auth and DCL info 
Patch by Sam Tunnicliffe; reviewed by Tyler Hobbs for CASSANDRA-7558
 2015-06-01 18:08:31 +01:00
stefania 3b85ea7340 Fix TrackerTest.addSSTables 
patch by stefania; reviewed by benedict for CASSANDRA-9514
 2015-06-01 16:43:56 +01:00
Jonathan Ellis c11644bbfb Merge branch 'cassandra-2.1' into cassandra-2.2 2015-06-01 10:27:55 -05:00
Jonathan Ellis 40c3ad6a0c merge from 2.0 2015-06-01 10:26:34 -05:00
Stefania Alborghetti b7adb03b41 Pass JVM_OPTS to standalone tools scripts, CASSANDRA-5969 2015-06-01 09:59:02 -05:00
Stefania Alborghetti 8b80b55611 Fixed TrackerTest on Linux, CASSANDRA-9514 2015-06-01 08:49:46 +02:00
Tyler Hobbs c34a329216 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
 2015-05-29 14:16:43 -05:00
Carl Yeksigian f294ee1272 Consistent error message for mixed counters, non-counters 
Patch by Carl Yeksigian; reviewed by Tyler Hobbs for CASSANDRA-9492
 2015-05-29 14:15:10 -05:00
Josh McKenzie 06e742fc7f Fix ColumnFamilyStoreTest.testSliceByNamesCommandOldMetadata 
Patch by jmckenzie; reviewed by jbellis for CASSANDRA-9501
 2015-05-29 13:35:17 -04:00
Jason Brown fdecab0382 update CHANGES 2015-05-29 10:10:31 -07:00
Jason Brown 1352ebd61d ant test-all results incomplete when parsed (part 2) 
patch by aweisberg; reviewed by jasobrown for CASSANDRA-9463
 2015-05-29 10:07:59 -07:00
Sylvain Lebresne 302eb46c8c Merge branch 'cassandra-2.1' into cassandra-2.2 2015-05-29 11:05:53 +02:00
Sylvain Lebresne e1a67a4f53 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
 2015-05-29 11:05:02 +02:00
Ariel Weisberg 173f2552d1 Fix condition in RangeTombstoneList.add that breaks test 
patch by aweisberg; reviewed by slebresne for CASSANDRA-9485
 2015-05-29 10:54:40 +02:00
Marcus Eriksson 180130a8e5 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java
	src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
	test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
 2015-05-29 09:57:54 +02:00
Marcus Eriksson eaeabffc8e Avoid getting unreadable keys during anticompaction 
Patch by marcuse; reviewed by benedict for CASSANDRA-9508
 2015-05-29 09:32:32 +02:00
T Jake Luciani 7d0676215e Revert refactor of doValidationCompaction which caused breaks from 9431 2015-05-28 13:34:03 -04:00