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

14920 Commits

Author SHA1 Message Date
Tyler Hobbs 0ef0394dfd Merge branch 'cassandra-2.1' into trunk 2014-09-19 16:03:07 -05:00
Philip Thompson 8589d04739 cqlsh: Fix UDT field selection 
Patch by Philip Thompson; reviewed by Tyler Hobbs for CASSANDRA-7891
 2014-09-19 16:02:40 -05:00
Aleksey Yeschenko 4e72656636 Merge branch 'cassandra-2.1' into trunk 2014-09-19 12:57:35 -07:00
Aleksey Yeschenko 488e775cc1 Fix tests by making QP use its own executor 2014-09-19 12:57:17 -07:00
Benedict Elliott Smith 0956a8a717 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
 2014-09-19 18:26:23 +01:00
Benedict Elliott Smith 0e83100776 Fix resource leak in event of corrupt sstable 
patch by benedict; review by yukim for CASSANDRA-7932
 2014-09-19 18:17:19 +01:00
Tyler Hobbs 3e305f8098 Merge branch 'cassandra-2.1' into trunk 2014-09-19 11:25:43 -05:00
blerer c5c0585b4b Validate token() args are in partition key order 
Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-6075
 2014-09-19 11:24:24 -05:00
Tyler Hobbs 20eb8f0c6c Merge branch 'cassandra-2.0' into cassandra-2.1 2014-09-19 11:19:56 -05:00
blerer 6198a75633 Validate token() args are in partition key order 
Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-6075
 2014-09-19 11:18:58 -05:00
Jonathan Ellis bcec4ea3d1 Merge branch 'cassandra-2.1' into trunk 2014-09-19 09:15:48 -05:00
Jonathan Ellis 1949212f54 comment 2014-09-19 09:15:06 -05:00
Brandon Williams 4c80d0fbe3 Merge branch 'cassandra-2.1' into trunk 2014-09-18 17:13:08 -07:00
Brandon Williams 7cfd3ed120 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-09-18 17:13:00 -07:00
Brandon Williams 75e4acbe20 Add method to invalidate permission cache via JMX 
Patch by brandonwilliams, reviewed by aleksey for CASSANDRA-7977
 2014-09-18 17:12:27 -07:00
Aleksey Yeschenko efa8efad48 Merge branch 'cassandra-2.1' into trunk 2014-09-18 16:43:20 -07:00
Robbie Strickland e1bc6b4a45 Warn when evicting prepared statements from cache 
patch by Robbie Strickland; reviewed by Aleksey Yeschenko for
CASSANDRA-7930
 2014-09-18 16:41:49 -07:00
Brandon Williams 1a7db7ae0d Merge branch 'cassandra-2.1' into trunk 2014-09-18 14:37:37 +00:00
Mikhail Stepura e9f94447ed Merge branch 'cassandra-2.1' into trunk 2014-09-18 13:31:08 -07:00
Aaron Ploetz 146b8e3977 (cqlsh) Add command line option for cqlshrc file path. 
patch by Aaron Ploetz; reviewed by Mikhail Stepura for CASSANDRA-7131
 2014-09-18 13:30:43 -07:00
Tyler Hobbs a810c477d9 Merge branch 'cassandra-2.1' into trunk 2014-09-18 12:37:01 -05:00
Tyler Hobbs 3dd2f0064f Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/transport/Message.java
	src/java/org/apache/cassandra/transport/messages/ErrorMessage.java
 2014-09-18 12:36:33 -05:00
Graham Sanderson cbc705d419 Log unclean client disconnect excs at DEBUG 
Patch by Graham Sanderson; reviewed by Tyler Hobbs for CASSANDRA-7849
 2014-09-18 12:26:08 -05:00
Brandon Williams aa8964afe0 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-09-18 14:37:30 +00:00
Brandon Williams 3f79af23e7 Allow propagating multiple gossip states atomically 
Patch by brandonwilliams, reviewed by jasobrown for CASSANDRA-6125
 2014-09-18 14:36:31 +00:00
Brandon Williams b18478d057 Merge branch 'cassandra-2.1' into trunk 2014-09-18 08:12:39 +00:00
Brandon Williams 74877bb6aa rm dead code 2014-09-18 08:12:32 +00:00
Brandon Williams 381ff18b23 Merge branch 'cassandra-2.1' into trunk 2014-09-18 06:52:34 +00:00
Brandon Williams ace937eb70 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-09-18 06:52:25 +00:00
Brandon Williams 549f035b92 Allow permissions cache to be set via JMX 
Patch by brandonwilliams, reviewed by aleksey for CASSANDRA-7968
 2014-09-18 06:51:22 +00:00
Aleksey Yeschenko d57890ca61 Merge branch 'cassandra-2.1' into trunk 2014-09-17 22:58:44 -07:00
Nate McCall 5ba1f80a25 Provide visibility into prepared statements churn 
patch by Nate McCall; reviewed by Aleksey Yeschenko for CASSANDRA-7921
 2014-09-17 22:57:44 -07:00
Aleksey Yeschenko 6748083404 Merge branch 'cassandra-2.1' into trunk 2014-09-17 22:47:05 -07:00
Aleksey Yeschenko dfe1f23511 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/ClientState.java
 2014-09-17 22:46:25 -07:00
Aleksey Yeschenko 62db99037e Include schema_triggers CF in readable system resources 
patch by Adam Holmberg; reviewed by Aleksey Yeschenko for CASSANDRA-7967
 2014-09-17 22:40:51 -07:00
Pavel Yaskevich 065cd67ab2 Merge branch 'cassandra-2.1' into trunk 2014-09-17 22:35:27 -07:00
Pavel Yaskevich 8026163dec Merge branch cassandra-2.0 into cassandra-2.1 2014-09-17 22:34:19 -07:00
Pavel Yaskevich 85aa794e1f Fix RowIndexEntry to report correct serializedSize 
patch by Pavel Yaskevich; reviewed by Aleksey Yeschenko for CASSANDRA-7948
 2014-09-17 22:19:21 -07:00
Aleksey Yeschenko a8285fea60 Merge branch 'cassandra-2.1' into trunk 2014-09-17 21:04:00 -07:00
Aleksey Yeschenko ad89d4437b Follow up to CASSANDRA-7719 
patch by Aleksey Yeschenko; reviewed by Jake Luciani for CASSANDRA-7719
 2014-09-17 21:02:15 -07:00
Brandon Williams 48682d69ad stupid brace 2014-09-17 15:26:39 +00:00
Brandon Williams a337336013 Make assassinate a first class command. 
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7935
 2014-09-17 15:25:01 +00:00
Brandon Williams a079779000 Remove deprecated removetoken command from nodetool 2014-09-17 14:47:52 +00:00
Brandon Williams 47cda388f5 Merge branch 'cassandra-2.1' into trunk 2014-09-17 14:07:25 +00:00
Yuki Morishita 134c2e9692 Merge branch 'cassandra-2.1' into trunk 2014-09-17 15:14:46 -05:00
Yuki Morishita 7c34d8bb72 Add CASSANDRA-7450 to CHANGES 2014-09-17 15:14:41 -05:00
blerer 9553dae93b Support IN clause for any clustering column 
Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-4762
 2014-09-17 13:54:45 -05:00
Yuki Morishita 87ba0dc1bc Merge branch 'cassandra-2.1' into trunk 2014-09-17 09:48:14 -05:00
Paulo Motta 125b4642db Make repair -pr work with -local 
patch by Paulo Motta; reviewed by yukim for CASSANDRA-7450
 2014-09-17 09:46:52 -05:00
Brandon Williams 83d15631f0 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-09-17 14:07:18 +00:00