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

13106 Commits

Author SHA1 Message Date
Jonathan Ellis 61b13b0e6a Avoid incremental compaction on Windows 
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7365
 2014-06-12 14:58:16 -05:00
Brandon Williams b4b3d80123 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-12 14:53:57 -05:00
Brandon Williams 3d81ac5ecd Merge branch 'cassandra-1.2' into cassandra-2.0 2014-06-12 14:53:47 -05:00
Brandon Williams d509fe1a5f Display generation/heartbeat in gossipinfo 
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7333
 2014-06-12 14:53:11 -05:00
Brandon Williams 6c8271f60a Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-12 14:45:58 -05:00
Brandon Williams daf6f68ec4 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2014-06-12 14:45:44 -05:00
Brandon Williams 29a89d818a Add replace_address_first_boot flag to only replace if not bootstrapped. 
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7356
 2014-06-12 14:41:52 -05:00
Aleksey Yeschenko c94caec1b5 Revert "Explicitly use Long.MAX_VALUE timestamp for counter deletions" 
This reverts commit 5fe7557627.

Conflicts:
	CHANGES.txt
 2014-06-12 14:09:46 -05:00
Mikhail Stepura 68c92652ae Handle SliceQueryFilter with empty bounds in CompositesSearcher 
patch by Mikhail Stepura; reviewed by Sylvain Lebresne for CASSANDRA-7372
 2014-06-12 11:09:38 -07:00
Jonathan Ellis fa601bdff0 return absolute path from resourceToFile 
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7335
 2014-06-12 12:00:37 -05:00
Brandon Williams ae8aad4745 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	conf/cassandra.yaml
	src/java/org/apache/cassandra/transport/Server.java
 2014-06-12 09:46:56 -05:00
Brandon Williams b48a17bfbb Enabled keepalive for native protocol 
Patch by brandonwilliams, reviewed by Sankalp Kohli for CASSANDRA-7380
 2014-06-12 09:30:29 -05:00
Brandon Williams ca14da48b4 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-06-12 09:29:53 -05:00
Brandon Williams 2d6babbcc9 Enable keepalive for native protocol 
Patch by brandonwilliams reviewed by Sankalp Kohli for CASSANDRA-7380
 2014-06-12 09:29:05 -05:00
Marcus Eriksson 00628e70a5 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-12 03:11:39 +02:00
Marcus Eriksson 2df27c0900 Reference sstable before populating keycache after compaction 
Patch by marcuse; reviewed by thobbs for CASSANDRA-7234
 2014-06-12 03:06:58 +02:00
Aleksey Yeschenko 99594cd687 Use node's host id in place of counter ids 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7366
 2014-06-11 17:21:35 -05:00
Aleksey Yeschenko 5fe7557627 Explicitly use Long.MAX_VALUE timestamp for counter deletions 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7346
 2014-06-11 09:47:22 -05:00
Dave Brosius deaf5ba157 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-09 21:41:59 -04:00
Dave Brosius 3e5f2bd64e Merge branch 'cassandra-1.2' into cassandra-2.0 2014-06-09 21:41:29 -04:00
Dave Brosius f40ddba477 simplify: prefer containsKey(x) to keySet().contains(x) 2014-06-09 21:40:45 -04:00
Dave Brosius b16c6b9a92 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-09 21:16:10 -04:00
Dave Brosius bb58d80d17 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-06-09 21:15:29 -04:00
Dave Brosius 19a207767c add logs/ and data/ to .gitignore 2014-06-09 21:14:58 -04:00
Aleksey Yeschenko 6d1f05e34c Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/transport/messages/BatchMessage.java
 2014-06-10 00:42:30 +03:00
Sylvain Lebresne aa9894df43 Fix native protocol CAS batches 
patch by Sylvain Lebresne; reviewed by Aleksey Yeschenko for
CASSANDRA-7337
 2014-06-10 00:27:42 +03:00
Brandon Williams 9adb31ca9a Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-09 14:18:22 -05:00
Brandon Williams 0c3424e21f Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/gms/Gossiper.java
 2014-06-09 14:18:09 -05:00
Brandon Williams 47edb3c061 Check all INTERNAL_IP states for seed match. 
Patch by Brandon Williams, reviewed by Jason Brown for CASSANDRA-6523
 2014-06-09 14:04:35 -05:00
Brandon Williams 60c7c73c45 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-09 13:43:20 -05:00
Brandon Williams 4b8bb86e27 Support auth in CqlRecordWriter 
Patch by Alex Liu, reviewed by Ben Coverston for CASSANDRA-7340
 2014-06-09 13:42:13 -05:00
Aleksey Yeschenko acb4cf62db Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-07 23:45:35 +03:00
Aleksey Yeschenko 429e5cf19e Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
 2014-06-07 23:45:12 +03:00
Aleksey Yeschenko ce98b2de09 Ninja-fix counter-in-primary-key validation exception message 2014-06-07 23:40:40 +03:00
Jonathan Ellis 0dbb4e0283 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-06-07 08:21:44 -05:00
Jonathan Ellis f727381253 Fix race in Thrift server that can exhaust the pool of worker threads 
patch by Christian Rolf and jbellis for CASSANDRA-6788
 2014-06-07 08:21:33 -05:00
Brandon Williams 2b5edc44f5 suggest cassandra-tools package 2014-06-06 17:48:32 -05:00
Aleksey Yeschenko 958a54c0bd CASSANDRA-7359 CHANGES.txt 2014-06-06 22:26:06 +03:00
belliottsmith 512c3d1a4e Reduce likelihood of contention on local paxos state locking 
Patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for CASSANDRA-7359
 2014-06-06 20:18:32 +01:00
Dave Brosius cd9e4638fa fix logging context 2014-06-06 00:01:58 -04:00
Dave Brosius 9b536eca9d update netty-all license 2014-06-05 23:30:59 -04:00
Aleksey Yeschenko 54b241858c Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-06-06 01:11:36 +03:00
Aleksey Yeschenko c54958a9d4 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2014-06-06 01:10:55 +03:00
Aleksey Yeschenko 2b002b4692 Fix CASSANDRA-7354 CHANGES.txt entry 2014-06-06 01:09:37 +03:00
Aleksey Yeschenko 029cd40317 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-06-06 01:00:18 +03:00
Aleksey Yeschenko 1e77219f78 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2014-06-06 00:56:50 +03:00
Aleksey Yeschenko 1e49abaf9c Fix rare potential NPE in HHOM page size calculation 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-7354
 2014-06-06 00:54:49 +03:00
Tyler Hobbs 60be74230e Use $CASSANDRA_HOME for default paths instead of /var 
Patch by Tyler Hobbs; reviewed by Brandon Williams and Joshua McKenzie
for CASSANDRA-7136
 2014-06-05 15:38:41 -05:00
Jake Luciani 4722fe70aa RefCount native frames from netty to avoid corruption bugs 
patch by tjake; reviewed by bes for CASSANDRA-7245
 2014-06-05 14:15:32 -04:00
Jonathan Ellis b29d882df8 Fix heap size calculation on Windows 
patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-7352
 2014-06-05 10:23:15 -05:00