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

13251 Commits

Author SHA1 Message Date
Tyler Hobbs 3fc8bb1edf Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-25 14:27:12 -05:00
Tyler Hobbs 83b3f13061 Set -Dcassandra.storagedir for all tool shell scripts 
Patch by Tyler Hobbs; review by Joshua McKenzie for CASSANDRA-7587
 2014-07-25 14:26:18 -05:00
Tyler Hobbs b2c511eacb Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-25 13:26:41 -05:00
Tyler Hobbs 638c40e817 Fix tracing of local portions of range slices 
Patch by Tyler Hobbs; review by Brandon Williams for CASSANDRA-7599
 2014-07-25 13:25:35 -05:00
Tyler Hobbs 831dd124f5 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-25 13:16:07 -05:00
Tyler Hobbs 9082281929 Use "keyspace updated" message for UDT changes in v1/2 protocols 
Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7617
 2014-07-25 13:15:40 -05:00
Brandon Williams b2a37c7989 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-25 13:11:18 -05:00
Brandon Williams 5544ecbf64 Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-07-25 13:11:08 -05:00
Brandon Williams f5e634c1cc update CL archive comments post-6905 2014-07-25 13:10:54 -05:00
Tyler Hobbs 192f693b5c Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-25 13:05:46 -05:00
Tyler Hobbs 5001b382ed Fix cqlsh deserialization of blobs 
Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7603
 2014-07-25 13:05:02 -05:00
Brandon Williams f03e505fdc Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-25 11:19:16 -05:00
Brandon Williams 557156914f this is why we merge forward, not backward 2014-07-25 11:19:07 -05:00
Brandon Williams 4f48ea001c Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-25 11:11:26 -05:00
Brandon Williams 8bf6974b4b fix test 2014-07-25 11:11:19 -05:00
Brandon Williams 5c14720bd6 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-25 11:08:26 -05:00
Brandon Williams d2934049b4 fix test for 2.0 2014-07-25 11:08:19 -05:00
Brandon Williams 2b35d4b94a fix test for 2.0 2014-07-25 11:08:03 -05:00
Brandon Williams b6d24bb992 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-25 10:58:53 -05:00
Brandon Williams 66577d6c22 Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-07-25 10:58:46 -05:00
Brandon Williams 60e56d4beb fix test for 2.0 2014-07-25 10:58:37 -05:00
Brandon Williams 34c030b3e5 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-25 10:47:16 -05:00
Brandon Williams 821d7a72de Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-07-25 10:47:07 -05:00
Brandon Williams d9cc6c1bf6 Add unordered PITR test 
Patch by Ala' Alkhaldi, reviewed by brandonwilliams for CASSANDRA-6905
 2014-07-25 10:45:31 -05:00
Yuki Morishita 107f5ba9b4 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-25 10:36:59 -05:00
Yuki Morishita e2219ebd8f Fix sstablelevelresetter hang 
patch by yukim; reviewed by krummas for CASSANDRA-7614
 2014-07-25 10:36:45 -05:00
Tyler Hobbs bc1f53aaf7 Add cqlsh completion for IF [NOT] EXISTS in CREATE/DROP USER 
Patch by Michał Michalski; review by Tyler Hobbs for CASSANDRA-7611

Conflicts:
	CHANGES.txt
 2014-07-24 18:01:45 -05:00
Tyler Hobbs 8081c54c2a Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-24 18:00:25 -05:00
Tyler Hobbs 17b26a2ae7 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
 2014-07-24 17:59:23 -05:00
Tyler Hobbs 59c7e25068 Add cqlsh completion for IF [NOT] EXISTS in CREATE/DROP USER 
Patch by Michał Michalski; review by Tyler Hobbs for CASSANDRA-7611
 2014-07-24 17:56:29 -05:00
Tyler Hobbs ee18049587 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-24 17:42:10 -05:00
Tyler Hobbs 72676dd48d Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
 2014-07-24 17:40:55 -05:00
Tyler Hobbs 67ce78fcc7 Always merge ranges owned by a single node in DES 
Patch by Ala' Alkhaldi; review by Tyler Hobbs for CASSANDRA-6930
 2014-07-24 17:38:26 -05:00
Tyler Hobbs f73a92957b Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-24 14:05:59 -05:00
Robert Stupp dceed39995 Fix errors when dropping non-existent indexes 
Patch by Robert Stupp; review by Tyler Hobbs for CASSANDRA-7590
 2014-07-24 14:04:48 -05:00
Aleksey Yeschenko 51dfe78218 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-24 20:39:58 +03:00
Aleksey Yeschenko 33719e759a Fix native protocol drop user type notification 
patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-7571

Conflicts:
	CHANGES.txt
 2014-07-24 20:36:50 +03:00
Aleksey Yeschenko 4f6e108e14 Fix ReversedType(DateType) mapping to native protocol 
patch by Karl Rieb; reviewed by Aleksey Yeschenko for CASSANDRA-7576

Conflicts:
	CHANGES.txt
 2014-07-24 20:33:49 +03:00
Mike Adamson 465d520cc2 Give read access to system.schema_usertypes to all authenticated users 
patch by Mike Adamson; reviewed by Aleksey Yeschenko for CASSANDRA-7578

Conflicts:
	CHANGES.txt
 2014-07-24 20:30:07 +03:00
Brandon Williams 7f571b57ab remove errant code block 2014-07-24 11:48:55 -05:00
Brandon Williams 90b3acadcc Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-07-23 15:05:05 -05:00
Brandon Williams c7b7a24939 update changes 2014-07-23 15:04:33 -05:00
Jonathan Ellis f7e3b9a6b3 merge 2014-07-23 12:56:00 -07:00
Brandon Williams f9fc846e9b Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	bin/cqlsh
 2014-07-23 13:14:28 -05:00
Brandon Williams cfedc0075d cqlsh: fix message when zero rows are returned 
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7580
 2014-07-23 13:12:44 -05:00
Tyler Hobbs b3f644fec8 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-23 12:08:21 -05:00
Tyler Hobbs 4cdfa85156 Ninja: fix index name spec for CREATE INDEX in CQL docs 
Follow-up for CASSANDRA-7527
 2014-07-23 12:05:00 -05:00
Brandon Williams 62e70d23e5 Pig support for hadoop CqlInputFormat 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6454
 2014-07-23 10:28:46 -05:00
Brandon Williams a1fe6349b9 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-23 10:27:53 -05:00
Brandon Williams 249bc4566c Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-07-23 10:27:41 -05:00