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

12581 Commits

Author SHA1 Message Date
T Jake Luciani f0575f153b high-scale-lib upgrade 
Patch by tjake; reviewed by Benedict Elliott Smith for CASSANDRA-7128
 2014-05-05 16:37:22 -04:00
belliottsmith 9881ea6b3e Cleanup and optimize collation and slice iterators 
patch by Aleksey Yeschenko and Benedict Elliott Smith; reviewed by
Aleksey Yeschenko for CASSANDRA-7107
 2014-05-05 22:53:25 +03:00
Brandon Williams 07dfb58adc Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-05 14:23:44 -05:00
Brandon Williams f52457036d Merge branch 'cassandra-1.2' into cassandra-2.0 2014-05-05 14:23:35 -05:00
Brandon Williams 64394b2526 remove stray bat file 2014-05-05 14:23:27 -05:00
Brandon Williams b62241182f Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/StorageService.java
 2014-05-05 11:49:23 -05:00
Brandon Williams 8bbe901f2a Correctly delete scheduled range xfers 
Patch by brandonwilliams, reviewed by aleksey for CASSANDRA-7143
 2014-05-05 11:47:27 -05:00
Sylvain Lebresne 3aa41fbce8 Fix ClassCastException on composite dense tables 
patch by slebresne; reviewed by thobbs for CASSANDRA-7112
 2014-05-05 09:23:27 +02:00
Sylvain Lebresne 7e8efd1bbc Fix super column filter conversion 
patch by slebresne; reviewed by thobbs for CASSANDRA-7138
 2014-05-05 09:21:46 +02:00
Sylvain Lebresne 706afc300d Fixup for CASSANDRA-6831 on 2.1 2014-05-05 09:20:18 +02:00
Dave Brosius 0ce6b179af remove changes line for 7149 as it was not pulled forward 2014-05-04 10:50:58 -04:00
Dave Brosius a2c3476ba3 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-05-04 10:47:12 -04:00
Jianwei Zhang 9eb346a643 fix time conversion to milliseconds in SimpleCondition.await 
patch by jzhang reviewed by dbrosius for cassandra-7149
 2014-05-04 10:25:38 -04:00
Mikhail Stepura a5266bc077 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	bin/cqlsh
 2014-05-03 23:30:22 -07:00
Mikhail Stepura e9bdb6a95c Issue a warning after 3 empty lines in statement 
patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7142
 2014-05-03 23:26:40 -07:00
Dave Brosius b2fad36622 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-04 00:20:48 -04:00
Dave Brosius 2e955d4818 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-05-04 00:20:21 -04:00
Dave Brosius c454807a75 make sure streams get closed 2014-05-04 00:19:51 -04:00
Dave Brosius a79ad681ff Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-04 00:09:17 -04:00
Dave Brosius 4233ee43d0 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-05-04 00:08:21 -04:00
Dave Brosius 2f32783bd6 make sure zone info gets completely read 2014-05-04 00:07:40 -04:00
Aleksey Yeschenko f486193ab5 Move BatchlogEndpointSelector to BatchlogManager.EndpointFilter + minor refactorings 2014-05-04 03:33:03 +03:00
Dave Brosius f12a8a32e4 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-03 16:54:36 -04:00
Dave Brosius 65cd825d0d fix node's broadcast address sanity check 2014-05-03 16:51:14 -04:00
Dave Brosius 38a48b1238 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-03 16:40:14 -04:00
Dave Brosius 3fb2dcdf06 fix npe if configURL is null (new URL(null) throws) 2014-05-03 16:39:16 -04:00
Brandon Williams b53442b20c Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-03 13:53:28 -05:00
Brandon Williams 3047ab6387 Add Cloudstack snitch 
Patch by Pierre-Yves Ritschard, reviewed by brandonwilliams for
CASSANDRA-7147
 2014-05-03 13:47:48 -05:00
Brandon Williams d3e778041b Merge branch 'cassandra-1.2' into cassandra-2.0 2014-05-03 13:44:30 -05:00
Brandon Williams 6f4853e78a Add Cloudstack snitch 
Patch by Pierre-Yves Ritschard, reviewed by brandonwilliams for
CASSANDRA-7147
 2014-05-03 13:43:40 -05:00
Brandon Williams 341153526e Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-03 13:33:45 -05:00
Brandon Williams 02e0eb6378 don't log retry policy so often 2014-05-03 13:33:38 -05:00
Brandon Williams 3bc4de96da Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-03 12:44:15 -05:00
Brandon Williams aa2b769aac fix indentation 2014-05-03 12:44:05 -05:00
Brandon Williams c7c5f68412 fix changes merge mess 2014-05-03 08:13:05 -05:00
Jonathan Ellis 8e897de687 merge from 2.1 2014-05-02 22:49:31 -05:00
Jonathan Ellis af96d405b4 Make batchlog replica selection rack-aware 
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-6551
 2014-05-02 22:47:27 -05:00
Jonathan Ellis fab45571b8 give some antlr targets more heap space 2014-05-02 22:41:14 -05:00
Dave Brosius 9432870658 add license for commons-math3.3.2 2014-05-02 23:34:33 -04:00
Dave Brosius 6708d05ec5 netty >= version 4.0 now has an artifact name of netty-all 2014-05-02 23:07:34 -04:00
Dave Brosius df62c62617 fix logback version string typo: 1.1.12 s/b 1.1.2 2014-05-02 22:52:11 -04:00
Dave Brosius bef913adc0 minor javadoc fixes 2014-05-02 21:11:45 -04:00
Dave Brosius 93fef85056 switch to using jamm with groupId com.github.jbellis, as this one is published for 0.2.6 2014-05-02 20:44:25 -04:00
Brandon Williams baee086f6d Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-02 16:39:55 -05:00
Brandon Williams 2658c90e67 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-05-02 16:39:45 -05:00
Brandon Williams 837bded794 fix build 2014-05-02 16:39:36 -05:00
Brandon Williams 8939ac4926 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-02 15:48:09 -05:00
Brandon Williams 238a020844 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2014-05-02 15:47:10 -05:00
Brandon Williams 562a22fcd2 Update system.peers correctly when relocating tokens. 
Patch by brandonwilliams, reviewed by tjake for CASSANDRA-7126
 2014-05-02 15:46:11 -05:00
Jonathan Ellis 3089c92d4e merge from 2.1 2014-05-02 13:57:13 -05:00