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

10577 Commits

Author SHA1 Message Date
Aleksey Yeschenko 01370bb6c7 Fix AbstractRowResolver and RowDigestResolver for speculative retries 
patch by Jonathan Ellis; reviewed by Aleksey Yeschenko for
CASSANDRA-6194
 2013-10-23 23:43:36 +08:00
Brandon Williams cc01b3165f Fix 2.0.2 changes pending re-roll 2013-10-23 10:35:56 -05:00
Brandon Williams f97eeac268 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-23 10:34:35 -05:00
Brandon Williams c040759da5 Make LOCAL_ONE the default CL for hadoop 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6214
 2013-10-23 10:34:03 -05:00
Jonathan Ellis 854de4ed56 fix tracing adding 2x activity instead of threadName 2013-10-23 09:46:49 -05:00
Aleksey Yeschenko 941cd456ae cqlsh: add SHOW SESSION <tracing-session> command 
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6228
 2013-10-23 22:35:14 +08:00
Sylvain Lebresne 322f9a9831 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2013-10-23 16:17:02 +02:00
Sylvain Lebresne 62e8804d5b Update changelog 2013-10-23 16:15:12 +02:00
Sylvain Lebresne 4768daa9d0 Avoid stack overflow on RangeTombstoneList insertion 
patch by slebresne; reviewed by frousseau for CASSANDRA-6181
 2013-10-23 16:13:28 +02:00
Sylvain Lebresne 86b26b67fe 6233 2013-10-23 15:57:19 +02:00
Sylvain Lebresne 1240c9bd22 Fix potential NPE while loading paxos state 
patch by slebresne; reviewed by jbellis for CASSANDRA-6211
 2013-10-23 14:29:12 +02:00
Sylvain Lebresne 93da683e0c Update LZ4 lib to 1.2.0 2013-10-23 11:20:23 +02:00
Sylvain Lebresne f8027ed8c8 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-23 10:22:12 +02:00
Sylvain Lebresne f388a2eb88 Use smaller stack size for tests 2013-10-23 10:21:48 +02:00
Dave Brosius e30810ebb4 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-22 21:25:34 -04:00
Dave Brosius de526610b3 add windows bat files for shell commands 
patch by sdelmas reviewed by dbrosius for CASSANDRA-6145
 2013-10-22 21:12:35 -04:00
Brandon Williams ebd50ff2a9 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2013-10-22 17:08:54 -05:00
Brandon Williams dbca6d62f1 fix a bunch of typos 2013-10-22 17:05:24 -05:00
Brandon Williams bee0b4b9df Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-22 16:58:27 -05:00
Brandon Williams df778818bf add ticket number to changes 2013-10-22 16:58:20 -05:00
Brandon Williams 2629e5e4ee update changes 2013-10-22 16:49:03 -05:00
Brandon Williams 4155afd510 Reject bootstrapping endpoints that are already in the ring with 
different gossip data
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-5571
 2013-10-22 16:44:35 -05:00
Brandon Williams 8a069587d5 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-22 15:29:24 -05:00
Brandon Williams 59bf44dd94 Fix harmless NPE in MM/HHOM 
Patch by brandonwilliams, reviewed by Tyler Hobbs for CASSANDRA-5185
 2013-10-22 15:28:47 -05:00
Sylvain Lebresne b6147c1c7b License and versions for 2.0.2 release 2013-10-22 18:01:51 +02:00
Sylvain Lebresne 7159ec1004 Fix SSTableLoader 
patch by thobbs; reviewed by slebresne for CASSANDRA-6205
 2013-10-22 17:42:50 +02:00
Sylvain Lebresne 66fe5bdaaa Revert use of speculative retries by default for now 2013-10-22 16:08:53 +02:00
Aleksey Yeschenko dfb976573d Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	bin/cqlsh
 2013-10-22 14:29:54 +08:00
Aleksey Yeschenko 12413ad1f8 Backport CASSANDRA-6196 to 1.2 
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6196
 2013-10-22 14:22:13 +08:00
Dave Brosius e7ec65f662 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-21 18:55:04 -04:00
Dave Brosius a9b403e649 remove calculation of unused expected compacted filesize 2013-10-21 18:54:01 -04:00
Aleksey Yeschenko c4c8bca8d5 cqlsh: fix CREATE/ALTER WITH completion 
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6196
 2013-10-22 03:14:24 +08:00
Aleksey Yeschenko 0c5f05bd96 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-22 00:27:56 +08:00
Aleksey Yeschenko 7e057f5046 BM.forceBatchlogReplay() should be executed in batchlogTasks 
follow-up to CASSANDRA-6079
 2013-10-22 00:26:05 +08:00
Aleksey Yeschenko 20f1b816b3 cqlsh: ignore empty 'value alias' in DESCRIBE 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-6139
 2013-10-21 23:14:37 +08:00
Aleksey Yeschenko b365edc462 ninja NodeProbe compactionHistory() -> getCompactionHistory() 2013-10-21 17:38:10 +08:00
Sylvain Lebresne 5c54262336 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/ColumnDefinition.java
	src/java/org/apache/cassandra/db/marshal/CompositeType.java
 2013-10-21 10:15:59 +02:00
Sylvain Lebresne 189a60728d Fix altering column types 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6185
 2013-10-21 10:10:54 +02:00
Aleksey Yeschenko edd1226fda Add reloadtriggers command to nodetool 
patch by Suresh; reviewed by Aleksey Yeschenko for CASSANDRA-4949
 2013-10-21 15:38:33 +08:00
Aleksey Yeschenko 146f813e56 CASSANDRA-6212 CHANGES.txt 2013-10-21 15:20:03 +08:00
Aleksey Yeschenko 28caff5a44 CQL3: support pre-epoch longs for TimestampType 
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6212
 2013-10-21 15:14:16 +08:00
Dave Brosius 1187c7aa0a Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-20 22:25:15 -04:00
Dave Brosius df188cc8d2 remove dead static noop method 2013-10-20 22:24:40 -04:00
Dave Brosius d00a2336b7 remove dead 'load' parm to getBootstrapTokens 2013-10-20 22:16:38 -04:00
Dave Brosius 72f47a4e59 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-20 21:56:52 -04:00
Dave Brosius 9afac24109 make sure files get closed 2013-10-20 21:52:08 -04:00
Jonathan Ellis 58014d3038 merge 2013-10-20 02:08:52 +01:00
Jonathan Ellis abe1395cbc Require CFRR batchSize to be at least 2 
patch by Alex Liu and jbellis for CASSANDRA-6114
 2013-10-20 02:08:08 +01:00
Jonathan Ellis 74d63ba566 merge from 1.2 2013-10-20 00:21:48 +01:00
Jonathan Ellis fa155248ee Require CFRR batchSize to be at least 2 
patch by Alex Liu and jbellis for CASSANDRA-6114
 2013-10-20 00:18:58 +01:00