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
Sylvain Lebresne 78e91c4cac Reduce run time for CQL tests 
patch by slebresne; reviewed by thobbs for CASSANDRA-7327
 2014-06-05 08:39:48 +02:00
Jonathan Ellis 285c369ac7 close segments in resetUnsafe 
patch by Ala' Alkhaldi; reviewed by Joshua McKenzie for CASSANDRA-7334
 2014-06-04 14:29:48 -05:00
Jonathan Ellis 8e85f0c32f Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-04 13:45:33 -05:00
Jonathan Ellis 00b5c36cc5 cleanup 2014-06-04 13:43:12 -05:00
Aleksey Yeschenko 2d76d9fc37 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
 2014-06-04 18:02:24 +03:00
Sam Tunnicliffe 05ffa8ff1e Add per-CF range read request latency metrics 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-7338
 2014-06-04 17:56:50 +03:00
Tyler Hobbs 6a4144b418 Add optional keyspace to DROP INDEX statement 
Patch by Andrés de la Peña; review by Tyler Hobbs for CASSANDRA-7314
 2014-06-03 17:32:17 -05:00
Mikhail Stepura fbe4df5e22 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-03 14:16:40 -07:00
Mikhail Stepura 500e7b7eaf Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
 2014-06-03 14:14:28 -07:00
Mikhail Stepura dc73f214e0 RepairTask didn't send a correct message on IllegalArgumentException 
patch by Mikhail Stepura; reviewed by Yuki Morishita for CASSANDRA-7336
 2014-06-03 14:10:38 -07:00
Mikhail Stepura 13198c7bcb Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-03 13:36:17 -07:00
Mikhail Stepura a39f4ea729 Ninja: typo in cqlsh 2014-06-03 13:35:55 -07:00
Aleksey Yeschenko 4ab20ba97f Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/db/CounterMutation.java
	src/java/org/apache/cassandra/service/StorageProxy.java
 2014-06-03 19:05:54 +03:00
Aleksey Yeschenko e8aaffa1b7 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/StorageProxy.java
 2014-06-03 19:03:16 +03:00
Aleksey Yeschenko 12a7a7ebfc CASSANDRA-7144 follow-up 2014-06-03 18:59:18 +03:00
Aleksey Yeschenko 1dc157afe7 Fix handling of empty counter replication mutations 
patch by Aleksey Yeschenko; reviewed by Richard Low for CASSANDRA-7144
 2014-06-03 18:51:20 +03:00
Jonathan Ellis 9de8d3ef59 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-03 10:35:33 -05:00
Jonathan Ellis 2800c7fdb8 merge #7063 from 1.2 2014-06-03 10:35:11 -05:00
Marcus Eriksson f2a656e9d6 Add missing file 2014-06-03 08:18:00 +02:00
Marcus Eriksson 0f2d7d0b95 Don't fail streams on failure detector downs 
Patch by JoshuaMcKenzie; reviewed by marcuse for CASSANDRA-3569
 2014-06-03 08:11:56 +02:00
Marcus Eriksson 878990cde8 Make sure we clear out repair sessions from netstats 
Patch by JoshuaMcKenzie; reviewed by marcuse for CASSANDRA-7329
 2014-06-03 08:04:52 +02:00
Marcus Eriksson d0c90e07ab Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-03 08:01:50 +02:00
Marcus Eriksson 58bb974a33 Fix infinite loop on exception while streaming 
Patch by JoshuaMcKenzie; reviewed by marcuse for CASSANDRA-7330
 2014-06-03 08:01:34 +02:00
Dave Brosius 371507a121 make NoOp's constructor private as it's a singleton 2014-06-03 00:01:11 -04:00
Dave Brosius a899512837 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-02 23:36:55 -04:00
Dave Brosius 62d9c43676 remove incorrect use of generics in non-generified method call 2014-06-02 23:36:21 -04:00
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