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

12051 Commits

Author SHA1 Message Date
Tyler Hobbs f67b7a477a Auto reload GossipingPropertyFileSnitch config 
Patch by Danield Shelepov, reviewed by Tyler Hobbs for CASSANDRA-5897
 2014-03-06 11:22:47 -06:00
Jonathan Ellis 728f677b0f Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-06 09:40:56 -06:00
Jonathan Ellis c2ec94b354 update cobertura version 
patch by Ed Capriolo for CASSANDRA-6800
 2014-03-06 09:40:46 -06:00
Sylvain Lebresne a052a912ef Fix comment post-merge 2014-03-06 10:28:31 +01:00
Sylvain Lebresne 2cb811a2cb Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
 2014-03-06 10:27:48 +01:00
Sylvain Lebresne 5ef53e6f7c Fix timestamp scaling issue for 6623 2014-03-06 10:26:20 +01:00
Sylvain Lebresne 872eef3dc6 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-03-06 10:15:19 +01:00
Sylvain Lebresne ba95ca0db5 Fix CQLSSTableWriter.addRow(Map<String, Object>) 
patch by slebresne; reviewed by thobbs for CASSANDRA-6526
 2014-03-06 10:07:51 +01:00
Sylvain Lebresne 5d67e852e2 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/db/SystemKeyspace.java
	src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
	src/java/org/apache/cassandra/utils/FBUtilities.java
	test/long/org/apache/cassandra/db/LongKeyspaceTest.java
	test/unit/org/apache/cassandra/SchemaLoader.java
	test/unit/org/apache/cassandra/config/DefsTest.java
	test/unit/org/apache/cassandra/db/CollationControllerTest.java
	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
	test/unit/org/apache/cassandra/db/KeyspaceTest.java
	test/unit/org/apache/cassandra/db/ReadMessageTest.java
	test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java
	test/unit/org/apache/cassandra/db/RemoveCellTest.java
	test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
	test/unit/org/apache/cassandra/tools/SSTableExportTest.java
 2014-03-06 10:05:29 +01:00
Sylvain Lebresne 773fade9ae FBUtilities.singleton() should use the CF comparator 
patch by slebresne; reviewed by thobbs for CASSANDRA-6778
 2014-03-06 08:56:08 +01:00
Brandon Williams 4cf8a8a6c3 Add hadoop progressable compatibility. 
Patch by Ben Coverston, reviewed by brandonwilliams for CASSANDRA-5201
 2014-03-05 12:54:42 -06:00
Brandon Williams 7f7a9cc754 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-05 11:23:47 -06:00
Brandon Williams 249230834c Add hadoop progressable compatibility. 
Patch by Ben Coverston, reviewed by brandonwilliams for CASSANDRA-5201
 2014-03-05 11:21:35 -06:00
Jonathan Ellis 0851fd74b8 merge from 2.0 2014-03-04 17:10:41 -06:00
Jonathan Ellis ab2717b6f6 Avoid race-prone second "scrub" of system keyspace 
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-6797
 2014-03-04 17:10:16 -06:00
Jonathan Ellis 163049391f always print stacktrace if it makes us crash 2014-03-04 17:07:13 -06:00
Mikhail Stepura e2a719ad0d Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-04 11:51:38 -08:00
Mikhail Stepura b07f4b8c77 Handle static columns in cqlsh. 
Patch by Mikhail Stepura for CASSANDRA-6703; reviewed by Aleksey Yeschenko
 2014-03-04 11:47:58 -08:00
Sylvain Lebresne ce94010b9b Update java-driver to 2.0 final for stress 
patch by djatnieks; reviewed by slebresne for CASSANDRA-6777
 2014-03-04 12:07:49 +01:00
Sylvain Lebresne 947e10fcba Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1 
Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
 2014-03-04 11:53:05 +01:00
Sylvain Lebresne 724eabedc2 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
	src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
 2014-03-04 11:51:54 +01:00
Sylvain Lebresne 0ff7f9969a Fix IllegalArgumentException when upgrading from 1.2 with SC 
patch by slebresne; reviewed by vijay2win for CASSANDRA-6733
 2014-03-04 11:30:54 +01:00
Sylvain Lebresne 6137b381d2 Fix UPDATE updating PRIMARY KEY columns implicitely 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6782
 2014-03-04 11:16:37 +01:00
Marcus Eriksson 56631e1390 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-03 15:04:10 +01:00
Marcus Eriksson ef20671c2c Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-03 15:04:00 +01:00
Marcus Eriksson 64098f7d6f Fix resetAndTruncate:ing CompressionMetadata 
Patch by kvaster, reviewed by marcuse for CASSANDRA-6791
 2014-03-03 15:03:34 +01:00
Marcus Eriksson 0439531274 Fix merge 2014-03-03 14:39:40 +01:00
Marcus Eriksson e4437bc188 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-03-03 14:26:40 +01:00
Marcus Eriksson 41d8a5f486 Fix resetAndTruncate:ing CompressionMetadata 
Patch by kvaster, reviewed by marcuse for CASSANDRA-6791
 2014-03-03 14:21:00 +01:00
Yuki Morishita dcca99684f Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-02-28 15:30:22 -06:00
Yuki Morishita b3a9a44343 Fix NPE on BulkLoader caused by losing StreamEvent 
patch by yukim; reviewed by sankalp kohli for CASSANDRA-6636
 2014-02-28 15:28:25 -06:00
Brandon Williams bbad16b7ee Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-02-28 15:15:07 -06:00
Brandon Williams fd53628cb0 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2014-02-28 15:14:24 -06:00
Brandon Williams f08ae394f0 Add CMSClassUnloadingEnabled JVM option 
Patch by Jonathan Lacefield, reviewed by brandonwilliams for
CASSANDRA-6541
 2014-02-28 15:11:50 -06:00
Yuki Morishita d55e191df1 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-02-28 15:02:30 -06:00
Yuki Morishita 9a62ef339c Replace differencers set with AtomicInteger 
to track sync complete
 2014-02-28 15:01:29 -06:00
Sylvain Lebresne 1ebbaea3b6 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-02-28 21:57:20 +01:00
Sylvain Lebresne fd609339ee Fix NPE when using static columns and IN 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6769
 2014-02-28 21:56:08 +01:00
Jonathan Ellis 336a665a14 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-02-28 14:45:13 -06:00
Jonathan Ellis 89da2c9704 fix build 2014-02-28 14:45:04 -06:00
Brandon Williams 3d25859065 fix changes for b2 2014-02-28 11:04:13 -06:00
Jonathan Ellis a6f5f361ca Merge branch 'cassandra-2.0' into cassandra-2.1 2014-02-28 10:41:12 -06:00
Jonathan Ellis 5b80b97ded merge from 1.2 2014-02-28 10:40:43 -06:00
Jonathan Ellis e5b92d8ad3 r/m populate_io_cache_on_flush from yaml (per-table since #4694) 2014-02-28 10:40:07 -06:00
Jonathan Ellis b41eb4ad72 merge from 2.0 2014-02-28 10:08:32 -06:00
Jonathan Ellis 319b42e58c Fix compaction_history timestamps 
patch by Chander Pechetty and jbellis for CASSANDRA-6784
 2014-02-28 10:07:16 -06:00
Jonathan Ellis 4eb21ea7aa kill startup on incompatible sstable instead of continuing and failing later 2014-02-28 10:05:18 -06:00
Jonathan Ellis 38a3181b04 merge from 2.0 2014-02-28 09:46:19 -06:00
Jonathan Ellis cdd3625db6 Pool CqlRecordWriter clients by inetaddress rather than Range 
patch by Christian Rolf; reviewed by jbellis for CASSANDRA-6665
 2014-02-28 09:44:51 -06:00
Sylvain Lebresne 15728ad8df Fix ClassCastException for compact table with composites 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6738
 2014-02-28 08:47:48 +01:00