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

394 Commits

Author SHA1 Message Date
Jonathan Ellis 3ac2614310 emphasize using sstablerepairedset with LCS 2014-05-28 12:35:14 +02:00
Brandon Williams 3d62a55303 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	NEWS.txt
	build.xml
	debian/changelog
 2014-05-06 11:37:43 -05:00
Brandon Williams 8d93c1fcba fix changes/news 2014-05-06 11:27:32 -05:00
Sylvain Lebresne 006853300f Versions and NEWS update for 2.0.8 release 2014-05-06 10:29:53 +02:00
T Jake Luciani 9f60c55ba4 Support consistent range movements. 
patch by tjake; reviewed by thobbs for CASSANDRA-2434
 2014-05-01 09:47:22 -04:00
Jonathan Ellis 647bfc6d79 make sstable2json output more readable, and remove support for supercolumn json (CASSANDRA-7078) 
patch by jbellis; reviewed by ayeschenko for CASSANDRA-7078
 2014-04-23 22:00:21 -05:00
Aleksey Yeschenko 66af6fedc0 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
	src/java/org/apache/cassandra/db/BatchlogManager.java
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/HintedHandOffManager.java
	src/java/org/apache/cassandra/db/SystemKeyspace.java
	src/java/org/apache/cassandra/service/StorageProxy.java
	test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
 2014-04-18 03:14:47 +03:00
Sylvain Lebresne 7dbbe9233c Update versions for 2.0.7 release 2014-04-14 16:43:46 +02:00
Sylvain Lebresne 3632811fac Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1 
Conflicts:
	CHANGES.txt
	NEWS.txt
 2014-03-31 12:34:24 +02:00
Sylvain Lebresne 8e172c8563 Remove 1.2 sstable support in 2.1 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6869
 2014-03-31 12:30:50 +02:00
Aleksey Yeschenko b7ac8f96c1 Serialize batchlog mutations with the version of the target node 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6931
 2014-03-31 13:09:36 +03:00
Dave Brosius 5310f26d44 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-08 22:22:31 -05:00
Sylvain Lebresne 656edc529d Update version, news and license for 2.0.6 2014-03-07 13:20:03 +01:00
Aleksey Yeschenko ee477cc4dd Replace index_interval with min/max_index_interval 
patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-6379
 2014-02-14 01:34:47 +03:00
Marcus Eriksson a7b72140b6 Avoid repairing already repaired data. 
Patch by lyubent, yukim and marcuse, reviewed by yukim for CASSANDRA-5153
 2014-02-08 08:46:24 +01:00
Sylvain Lebresne 58d1a4f816 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	CHANGES.txt
 2014-02-05 16:38:18 +01:00
Sylvain Lebresne 29670eb669 Update changes and news file for 2.0.5 re-roll 2014-02-05 09:22:13 +01:00
Aleksey Yeschenko 63f110b5e0 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/tools/NodeCmd.java
	src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
 2014-02-03 23:32:23 +03:00
Aleksey Yeschenko 728c4fa9bf Let scrub optionally skip broken counter partitions 
patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-5930
 2014-02-03 23:01:31 +03:00
Aleksey Yeschenko d939be46b7 Require 2.0.5 for rolling upgrades 2014-01-27 19:23:47 -06:00
Aleksey Yeschenko 714c423360 New counters implementation 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6504
 2014-01-27 16:37:41 -06:00
Brandon Williams 4c8a8812cf Merge branch 'cassandra-2.0' into trunk 2014-01-22 17:12:41 -06:00
Brandon Williams f7f9de52fd Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	NEWS.txt
 2014-01-22 17:12:35 -06:00
Brandon Williams 0eac408358 ocd 2014-01-22 17:09:31 -06:00
Brandon Williams 8a078054ee Merge branch 'cassandra-2.0' into trunk 2014-01-16 16:46:58 -06:00
Brandon Williams 120437e153 Update NEWS for 6589 2014-01-16 16:46:51 -06:00
Yuki Morishita 0a1b277d65 CF id is now non-deterministic 
and data dir/key cache are also unique per CF id.
patch by yukim; reviewed by Pavel Yaskevich for CASSANDRA-5202
 2014-01-07 10:28:48 -06:00
Aleksey Yeschenko 59c996212c Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/db/BatchlogManager.java
 2014-01-05 03:26:20 +03:00
Aleksey Yeschenko 95f1b5f298 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/db/BatchlogManager.java
 2014-01-05 03:18:49 +03:00
Aleksey Yeschenko 2a7c20ea91 Add ability to throttle batchlog replay 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6550
 2014-01-05 03:06:47 +03:00
Sylvain Lebresne 6ab82a4698 Update versions for 1.2.13 release 2013-12-11 15:17:25 +01:00
Sylvain Lebresne e239ea61e4 Merge branch 'cassandra-2.0' into trunk 2013-11-21 09:53:59 +01:00
Sylvain Lebresne 08f2e9797f Support NaN and Infinity as float constants 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6003
 2013-11-21 09:53:00 +01:00
Jonathan Ellis 22b9e08b6b add #6142 to CHANGES + NEWS 2013-11-19 16:34:58 -06:00
Sylvain Lebresne 34645c37d1 Disallow updating CQL3 tables from thrift 
patch by slebresne; reviewed by jbellis for CASSANDRA-6370
 2013-11-18 17:16:11 +01:00
Aleksey Yeschenko edeebed147 Fix trunk NEWS.txt 2013-11-08 23:40:55 +03:00
Aleksey Yeschenko 1a99801610 Merge branch 'cassandra-2.0' into trunk 2013-11-08 23:39:59 +03:00
Aleksey Yeschenko d52e7e6fa8 Fix NEWS.txt 2013-11-08 23:39:05 +03:00
Sylvain Lebresne 2bbabe154e Merge branch 'cassandra-2.0' into trunk 2013-11-04 16:13:06 +01:00
Sylvain Lebresne 4a439d22c5 Error out correctly when frame is too large 
patch by slebresne; reviewed by dnorberg for CASSANDRA-5981
 2013-11-04 16:12:02 +01:00
Jonathan Ellis a71f47a0a2 Merge branch 'cassandra-2.0' into trunk 2013-10-31 22:22:07 -05:00
Jonathan Ellis 553792134d mention 5950 in NEWS 2013-10-31 22:22:00 -05:00
Jonathan Ellis ba3c1bcb93 Merge remote-tracking branch 'origin/trunk' into trunk 2013-10-29 15:41:23 -05:00
Jonathan Ellis 9e2ccc15df change CRTO default to 5% 2013-10-29 15:41:04 -05:00
Brandon Williams 43d3b355f8 Merge branch 'cassandra-2.0' into trunk 2013-10-29 15:06:54 -05:00
Brandon Williams 5eddf18546 Add beforeChange notification to IEndpointStateChangeSubscriber 
Patch by Sergio Bossa, reviewed by brandonwilliams for CASSANDRA-6135
 2013-10-29 15:03:29 -05:00
Sylvain Lebresne e7ff361c83 Merge branch 'cassandra-2.0' into trunk 2013-10-29 11:12:03 +01:00
Sylvain Lebresne 97cbf6ad33 Add CQL-aware SSTableWriter 
patch by slebresne; reviewed by jbellis for CASSANDRA-5894
 2013-10-29 11:11:05 +01:00
Aleksey Yeschenko e79cd74d71 Merge branch 'cassandra-2.0' into trunk 2013-10-23 23:50:17 +08:00
Aleksey Yeschenko 4adfd5c5aa Revert "Revert use of speculative retries by default for now" 
This reverts commit 66fe5bdaaa.
 2013-10-23 23:49:44 +08:00