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 650 MiB
Commit Graph

12800 Commits

Author SHA1 Message Date
Brandon Williams e4090f10e5 Move less common tools into a new cassandra-tools package. 
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-7160
 2014-05-29 10:24:27 -05:00
Aleksey Yeschenko a4bea74aeb Support more concurrent requests in native protocol 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7231
 2014-05-29 18:08:37 +03:00
Jake Luciani 969a92804d Ninja fix for CASSANDRA-7245 2014-05-29 09:13:23 -04:00
Sylvain Lebresne ef41567fa0 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
 2014-05-29 12:54:33 +02:00
Sylvain Lebresne 975145c277 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-05-29 12:49:19 +02:00
Sylvain Lebresne 7bbeb5aa2d Fix bug with some IN queries missing results 
patch by slebresne; reviewed by thobbs for CASSANDRA-7105
 2014-05-29 12:48:42 +02:00
Sylvain Lebresne 0932ed670c Tuple types 
patch by slebresne; reviewed by thobbs for CASSANDRA-7248
 2014-05-29 11:33:11 +02:00
Tyler Hobbs 01c5e346fb Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
 2014-05-28 17:43:29 -05:00
Tyler Hobbs 50599d225f Ninja: add missing string format placeholder 2014-05-28 17:42:22 -05:00
Tyler Hobbs 7a284ae93a Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-28 17:39:13 -05:00
Tyler Hobbs d31c29c5a9 Ninja: use equals() for Boolean comparison 2014-05-28 17:38:22 -05:00
Mikhail Stepura 3391b99a0b cqlsh: Handle collections embedded into UDTs correctly. 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7267
 2014-05-28 15:14:25 -07:00
Tyler Hobbs ea02b69001 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/cql3/Tuples.java
 2014-05-28 17:00:28 -05:00
Tyler Hobbs d92a79f5b3 Ninja: remove redundant check for null 2014-05-28 16:59:06 -05:00
Tyler Hobbs 5767757abc Fix DataOutputTest on Windows 
Patch by Ala' Alkhaldi; review by Joshua McKenzie for CASSANDRA-7265
 2014-05-28 16:43:26 -05:00
Aleksey Yeschenko 929eaa75e8 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-28 23:26:17 +03:00
Aleksey Yeschenko 04ba46231d Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2014-05-28 23:23:52 +03:00
Aleksey Yeschenko a37482144f CHANGES.txt whitespace 2014-05-28 23:22:55 +03:00
Aleksey Yeschenko 35efdc1e39 Add authentication support to shuffle 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-6484
 2014-05-28 23:19:54 +03:00
Brandon Williams de0cb79721 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-28 14:39:54 -05:00
Brandon Williams 999bee7951 remove duplicate changes entry 2014-05-28 14:39:03 -05:00
Brandon Williams bb1deac0b9 Revert 5417 changes to hadoop 
Patch by slebresne, reviewed by brandonwilliams for CASSANDRA-7241
 2014-05-28 13:22:37 -05:00
Jake Luciani e9e91d7b50 Handle overlapping multislices in thrift and cql 
Patch by pcmanus and tjake; reviewed by tjake for CASSANDRA-7279
 2014-05-28 13:14:43 -04:00
Jake Luciani 7f63b1f958 Backport MultiSliceRequest 
Patch by Ed Capriolo; Reviewed by tjake for CASSANDRA-7027
 2014-05-28 12:50:35 -04:00
Brandon Williams 4a295b6bee Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-28 11:33:49 -05:00
Brandon Williams a3b9d569f3 Use HadoopCompat to get job context 
Patch by Ben Coverston, reviewed by brandonwilliams for CASSANDRA-7315
 2014-05-28 11:33:13 -05:00
Dave Brosius 6d1500c501 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-28 06:45:39 -04:00
Oded Peer 0c96f99e48 add src/resources to the generate eclipse .project file's src paths 
patch by opeer reviewed by dbrosius for cassandra-5964
 2014-05-28 06:44:04 -04:00
Jonathan Ellis 3ac2614310 emphasize using sstablerepairedset with LCS 2014-05-28 12:35:14 +02:00
Jonathan Ellis 4a6525655c Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-28 11:51:55 +02:00
Jonathan Ellis b59ae73cf2 explain how to specify a keyspace 2014-05-28 11:51:42 +02:00
Jonathan Ellis 5d40dffabe xmx 2014-05-28 11:51:41 +02:00
Marcus Eriksson 5b3144905f Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-28 07:45:24 +02:00
Marcus Eriksson 54618a1b3e Make sure we don't try to compact already compacting sstables in HHOM 
Patch by marcuse; reviewed by jbellis for CASSANDRA-7288
 2014-05-28 07:43:47 +02:00
Brandon Williams 8cb50583d4 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-27 18:12:34 -05:00
Brandon Williams 81286b0ca2 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
 2014-05-27 18:12:25 -05:00
Brandon Williams 4e67631ef8 fix typo 2014-05-27 18:11:38 -05:00
Marcus Eriksson 86b6ec5299 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
 2014-05-27 10:43:50 +02:00
Marcus Eriksson 367c741931 Add option to do more aggressive tombstone compaction. 
Patch by pauloricardomg; reviewed by marcuse for CASSANDRA-6563
 2014-05-27 10:39:17 +02:00
Marcus Eriksson 8602fe8ce8 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-27 10:29:03 +02:00
Marcus Eriksson 9376fddccf Copy compaction options to make sure they are reloaded. 
Patch by pauloricardomg; reviewed by marcuse for CASSANDRA-7290
 2014-05-27 10:24:48 +02:00
Dave Brosius 7f930e0279 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-26 16:39:50 -04:00
Dave Brosius ea5b6246d2 don't NPE shutting down, due to gossip failure 2014-05-26 16:39:10 -04:00
Mikhail Stepura 39c295d803 Properly decode UDTs with nulls in cqlsh 
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-7289
 2014-05-26 09:41:55 -07:00
Aleksey Yeschenko a277eabe17 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	bin/cqlsh
 2014-05-25 18:16:32 +03:00
Patrick McFadin 6faf80c9d2 cqlsh: always emphasize the partition key in DESC output 
patch by Patrick McFadin; reviewed by Aleksey Yeschenko for
CASSANDRA-7274
 2014-05-25 18:14:39 +03:00
Jonathan Ellis 3aef07dbaa fix countAllBatches query 
patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-7300
 2014-05-25 07:23:43 -05:00
Dave Brosius f64dc45276 fix merge-created bad map key lookup type 2014-05-24 01:44:37 -04:00
Tyler Hobbs e0502ea298 Bump cqlsh default CQL version to 3.1.7 
Follow up for CASSANDRA-6875
 2014-05-23 16:31:20 -05:00
Brandon Williams 992eff2953 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-23 14:09:07 -05:00