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

12830 Commits

Author SHA1 Message Date
Marcus Eriksson e398c6bb89 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-06-02 08:59:50 +02:00
Marcus Eriksson 709b9fc319 Make StreamSession#closeSession() idempotent 
Patch by JoshuaMcKenzie; reviewed by marcuse for CASSANDRA-7262
 2014-06-02 08:58:11 +02:00
Dave Brosius 1c33ea3677 use long math for long results 2014-05-30 23:58:51 -04:00
Dave Brosius f66689db97 fix cast guard to be of the c* FutureTask type 2014-05-30 23:54:17 -04:00
Brandon Williams e56a64edb0 Upgrade to Pig 0.12.1 
Patch by brandonwilliams for CASSANDRA-6556
 2014-05-30 17:52:08 -05:00
Jonathan Ellis d93572d5c3 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-30 22:48:51 +01:00
Jonathan Ellis e68ac31f3f make Shuffle client static 2014-05-30 22:48:20 +01:00
Aleksey Yeschenko 90477c3107 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-30 23:51:58 +03:00
Josh McKenzie 886d9fce46 Fix NPE in StreamTransferTask.createMessageForRetry() 
patch by Josh McKenzie; reviewed by Aleksey Yeschenko for CASSANDRA-7323
 2014-05-30 23:49:09 +03:00
Aleksey Yeschenko 9141f7ba73 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
 2014-05-30 21:24:24 +03:00
Aleksey Yeschenko 8480fa7be1 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
 2014-05-30 21:16:42 +03:00
Aleksey Yeschenko d48a1871d8 Use LOCAL_ONE for non-superuser auth queries 
patch by Aleksey Yeschenko; reviewed by Jason Brown for CASSANDRA-7328
 2014-05-30 21:12:33 +03:00
Mikhail Stepura 8436ee6166 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-30 11:00:05 -07:00
Mikhail Stepura e2c74d5655 cqlsh: Count only empty lines for a "Blank lines" warning. 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7325
 2014-05-30 10:52:20 -07:00
Sylvain Lebresne c108ce5bf2 Licenses and versions in preparation of 2.1rc1 release 2014-05-30 17:27:53 +02:00
Jason Brown a30dfbd74f Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-30 05:48:39 -07:00
Jason Brown c2563dbc8b Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/StorageService.java
 2014-05-30 05:47:05 -07:00
Jason Brown 2f497eda0f Hint streaming can cause decommission to fail 
patch by jasobrown, reviewed by marcuse for CASSANDRA-7219
 2014-05-30 05:40:30 -07:00
Tyler Hobbs 30df4a7283 Fix CqlPagingRecordReader on tables with few rows 
Patch by Tyler Hobbs; reviewed by Brandon Williams for CASSANDRA-7322
 2014-05-29 17:31:43 -05:00
belliottsmith ee950b4103 Revert flush directory (CASSANDRA-6357) 
Patch by Jonathan Ellis; reviewed by Benedict Elliott Smith
 2014-05-29 22:37:50 +01:00
belliottsmith 5420b7a229 More efficient executor service for fast operations 
Patch by Benedict Elliott Smith; reviewed by Jason Brown for CASSANDRA 4718
 2014-05-29 22:20:21 +01:00
Aleksey Yeschenko a8d18c9c19 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-29 23:00:03 +03:00
Aleksey Yeschenko 7216639e51 Add conditional CREATE/DROP USER support 
patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-7264
 2014-05-29 22:55:38 +03:00
Tyler Hobbs 77f06b8c7c Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	test/unit/org/apache/cassandra/cql3/MultiColumnRelationTest.java
 2014-05-29 13:28:01 -05:00
Tyler Hobbs 6574de5342 Fix bound building for multi-column IN restrictions 
Patch by Tyler Hobbs and Sylvain Lebresne as a follow up on
CASSANDRA-6875
 2014-05-29 12:56:12 -05:00
Aleksey Yeschenko 743becb540 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	NEWS.txt
	src/java/org/apache/cassandra/config/CFMetaData.java
 2014-05-29 19:57:24 +03:00
Aleksey Yeschenko d72777bd52 Swap local and global default read repair chances 
patch by Aleksey Yeschenko; reviewed by Jason Brown for CASSANDRA-7320
 2014-05-29 19:52:34 +03:00
Aleksey Yeschenko a0ef84f4d1 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-29 19:07:37 +03:00
Aleksey Yeschenko 824ed37fcc Merge branch 'cassandra-1.2' into cassandra-2.0 2014-05-29 19:05:21 +03:00
Aleksey Yeschenko ea26dbd730 Fix availability validation for LOCAL_ONE CL 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7319
 2014-05-29 19:01:32 +03:00
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