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

13890 Commits

Author SHA1 Message Date
Brandon Williams 3d9db291af Merge branch 'cassandra-2.1' into trunk 2014-07-18 12:36:31 -05:00
Brandon Williams 0ad1706037 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-18 12:36:20 -05:00
Brandon Williams 8fd8832a87 Fix word count 
Patch by  Ala' Alkhaldi, reviewed by brandonwilliams for CASSANDRA-7200
 2014-07-18 12:35:57 -05:00
Brandon Williams 2215a4fdc2 Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-07-18 12:35:46 -05:00
Brandon Williams bf50717fdf Make cql3 word count executable 2014-07-18 12:34:39 -05:00
Brandon Williams 337e4a8292 Fix word count 
Patch by  Ala' Alkhaldi, reviewed by brandonwilliams for CASSANDRA-7200
 2014-07-18 12:31:17 -05:00
Brandon Williams ddc0f66d97 Merge branch 'trunk' 2014-07-17 16:00:12 -05:00
Brandon Williams e5625fcad9 Merge branch 'cassandra-2.1' 2014-07-17 15:59:49 -05:00
Brandon Williams 4831bf41e0 Merge branch 'cassandra-2.1' into trunk 2014-07-17 15:59:21 -05:00
Brandon Williams 7a1edabd92 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-17 15:59:13 -05:00
Brandon Williams 43c2c169b7 fix setlogginglevel help in nodetool 2014-07-17 15:59:05 -05:00
Jonathan Ellis db70f5a3fb Merge branch 'cassandra-2.1' into trunk 2014-07-17 15:57:43 -05:00
Jonathan Ellis 5dfee585dd fix build on os x 2014-07-17 15:57:30 -05:00
Jonathan Ellis 82d819920a Merge branch 'cassandra-2.1' into trunk 2014-07-17 15:57:08 -05:00
Jonathan Ellis 14151a40b1 colorize PK + clustering differently 
patch by Mihai Seteu; reviewed by Robert Stupp for CASSANDRA-6910
 2014-07-17 15:57:01 -05:00
Brandon Williams c996a36d7a Merge branch 'cassandra-2.1' into trunk 2014-07-17 15:49:44 -05:00
Brandon Williams f873a32786 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-17 15:49:35 -05:00
Brandon Williams 5de9c17dd5 Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-07-17 15:49:12 -05:00
Brandon Williams 062addb4c5 fix setlogginglevel help in nodetool 2014-07-17 15:49:01 -05:00
Tyler Hobbs d0871336a6 Merge branch 'cassandra-2.1' into trunk 2014-07-17 15:00:35 -05:00
Tyler Hobbs 3d0e54e14b Ninja: fix CASSANDRA-7454 placement in CHANGES.txt 2014-07-17 14:59:36 -05:00
Tyler Hobbs b9f03c88db Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-17 14:59:17 -05:00
Tyler Hobbs 9c1782d397 Backport CASSANDRA-7454 to 2.1.0 2014-07-17 14:58:09 -05:00
Tyler Hobbs 1a58ecc266 Merge branch 'cassandra-2.1' into trunk 2014-07-17 14:45:31 -05:00
Tyler Hobbs e64c301dd3 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-17 14:45:07 -05:00
Tyler Hobbs e4b40c75c0 Fix cqlsh authentication with 2.1 python driver 
Patch by Mike Adamson; reviewed by Tyler Hobbs for CASSANDRA-7564
 2014-07-17 14:43:47 -05:00
Jonathan Ellis 41a91e9a10 Merge branch 'cassandra-2.1' into trunk 2014-07-17 12:05:05 -05:00
Jonathan Ellis 22f811e3b5 add support for arbitrary -D options to .ps1 script 
patch by Joshua McKenzie; reviewed by Philip Thompson for CASSANDRA-7435
 2014-07-17 12:05:00 -05:00
Tyler Hobbs ca60eacad9 Merge branch 'cassandra-2.1' into trunk 2014-07-16 17:21:19 -05:00
Tyler Hobbs 57ec7b7352 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-16 17:20:24 -05:00
Tyler Hobbs 2a661195fe Handle queries on multiple secondary index types 
Patch and review by Sam Tunnicliffe and Tyler Hobbs for CASSANDRA-7525
 2014-07-16 17:18:46 -05:00
Jonathan Ellis e69fee52b9 Merge branch 'cassandra-2.1' into trunk 2014-07-16 16:18:01 -05:00
Jonathan Ellis 367a3696b3 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-16 16:17:53 -05:00
Jonathan Ellis 545e2e1cba Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-07-16 16:17:44 -05:00
Jonathan Ellis 93c27549a3 update column_index_size_in_kb description 2014-07-16 16:17:34 -05:00
Yuki Morishita 287bea327d Merge branch 'cassandra-2.1' into trunk 2014-07-16 15:59:32 -05:00
Yuki Morishita 4b2e946f61 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-07-16 15:59:07 -05:00
Yuki Morishita dc7d5a0a4b Merge branch 'cassandra-1.2' into cassandra-2.0 2014-07-16 15:58:44 -05:00
Yuki Morishita 192596ad75 Fix row size miscalculation in LazilyCompactedRow 
when RangeTombstone is involved.
patch by yukim; reviewed by jbellis for CASSANDRA-7543
 2014-07-16 15:57:31 -05:00
Tyler Hobbs 07ea172d6e Merge branch 'cassandra-2.1' into trunk 2014-07-16 15:38:30 -05:00
Tyler Hobbs 85014dfb69 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-16 15:38:08 -05:00
Tyler Hobbs 6b988fddd0 Ninja: fix grammar for tuple type in CQL docs 
Follow up for CASSANDRA-7527
 2014-07-16 15:36:58 -05:00
Tyler Hobbs 14826794c3 Merge branch 'cassandra-2.1' into trunk 2014-07-16 11:57:48 -05:00
Tyler Hobbs d2ae187c7d Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-16 11:57:23 -05:00
Tyler Hobbs 88e05719b6 Update cqlsh python driver to 2.1 
Patch by Mikhail Stepura and Tyler Hobbs; reviewed by Aleksey Yeschenko
for CASSANDRA-7509
 2014-07-16 11:56:29 -05:00
Tyler Hobbs c7f3a238e7 Follow up to 7111 to fix failing unit tests on trunk 
Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-7111
 2014-07-16 11:26:35 -05:00
Tyler Hobbs 82cfcab4c8 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2014-07-15 18:23:39 -05:00
Tyler Hobbs c70216a5b3 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-15 18:23:10 -05:00
Tyler Hobbs 721afaead6 Fix configuration error when running nodetool ring 
Patch by Tyler Hobbs; reviewed by Jeremiah Jordan for CASSANDRA-7508
 2014-07-15 18:22:26 -05:00
Tyler Hobbs 6319dc804f Bump CQL version to 3.2.0 and update CQL docs 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7527
 2014-07-15 18:20:08 -05:00