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

131 Commits

Author SHA1 Message Date
Brandon Williams 0f13031023 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	build.xml
	test/conf/log4j-junit.properties
 2013-10-14 14:19:20 -05:00
Brandon Williams fe598e77e6 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	build.xml
	src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
 2013-10-14 14:17:05 -05:00
Brandon Williams 4e35969795 Add PigUnit unit tests. 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-5695
 2013-10-14 14:13:18 -05:00
Dave Brosius 4ba8e3c556 fix error in logback config files, causing INFO to spew unwantedly 2013-09-17 22:09:42 -04:00
Vijay Parthasarathy fcd0aebb6e Merge branch 'cassandra-2.0' into trunk 2013-09-14 17:47:02 -07:00
Vijay Parthasarathy 86b32704b4 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-14 16:08:18 -07:00
Vijay Parthasarathy 742e5baf63 Fix CommitLogReplayer date time issue 
patch by Vijay ; reviewed by jbellis for CASSANDRA-5909
 2013-09-14 16:05:54 -07:00
Dave Brosius 0ec481bd64 add ThresholdFilter for stderr for tests for cassandra-5961 2013-08-30 20:39:20 -04:00
Dave Brosius 29605aedd9 switch logging from log4j to logback 
patch by dbrosius reviewed by jbellis for cassandra-5883
 2013-08-15 06:54:37 -04:00
Vijay Parthasarathy 4f2fdc2e73 Fix trigger directory detection code 
Patch by Vijay, reviewed by jebllis for CASSANDRA-5826
 2013-08-03 11:21:07 -07:00
Brandon Williams 81cbdc5312 Add yaml network topology snitch for mixed ec2/other envs 
Patch by Eric Dong, reviewed by brandonwilliams for CASSANDRA-5339
 2013-04-02 14:56:32 -05:00
Aleksey Yeschenko e79d9fbf84 Remove memory emergency pressure valve logic 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-3534
 2013-03-11 19:24:27 +03:00
Aleksey Yeschenko 0b83682b40 Add CQL3-based implementations of IAuthenticator and IAuthorizer 
Patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-4898
 2013-02-15 01:26:10 +03:00
Vijay Parthasarathy e90dcd51d0 Make Ec2Region's datacenter name configurable 
patch by Jason Brown; reviewed by Vijay for CASSANDRA-5155
 2013-01-14 20:57:25 -08:00
Jonathan Ellis 40e22489cd r/m obsolete and unnecessary rpc_timeout_in_ms override from test config 2012-12-04 21:58:20 -06:00
Aleksey Yeschenko 5a3eb1a6c3 Replace IAuthority with new IAuthorizer; patch by Aleksey Yeschenko, 
reviewed by Jonathan Ellis for CASSANDRA-4874
 2012-11-27 20:30:24 +03:00
Vijay Parthasarathy 8495560c2b Support client Thrift SSL socket 
patch by Jason Brown; reviewed by Vijay for CASSANDRA-4239
 2012-10-17 18:58:04 -07:00
Jonathan Ellis 604a38645c remove COPP 
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-2479
 2012-06-04 17:23:02 -05:00
Jonathan Ellis 46e422a941 Open one sstableScanner per level for leveled compaction 
patch by slebresne and jbellis for CASSANDRA-4142
 2012-05-02 12:48:23 -05:00
Jonathan Ellis 4ff5c45c70 fix test config so localhost is seed 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1158753 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-17 14:50:53 +00:00
Jonathan Ellis 2b72987596 fix tests 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1136472 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-16 15:00:04 +00:00
Jonathan Ellis f4b3c01dff add a server-wide cap on memtable memory usage 
patch by jbellis; reviewed by Stu Hood for CASSANDRA-2006

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090064 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-07 23:49:06 +00:00
Jonathan Ellis 6d2f24cd63 Revert prematurely-committed "add a server-wide cap on memtable memory usage" 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1089526 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-06 16:33:35 +00:00
Jonathan Ellis a287f42ceb add a server-wide cap on memtable memory usage 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1089521 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-06 16:21:17 +00:00
Eric Evans 4b51718b7b set level to DEBUG for tests (inadvertently changed to TRACE) 
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1087046 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-30 19:06:03 +00:00
Gary Dusbabek ebc7278d78 sanitize configuration code. patch by Jon Hermes, reviewed by gdusbabek. CASSANDRA-1906 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1082510 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-17 14:50:32 +00:00
Eric Evans cea86b62a5 update JDBC driver and tests for BytesType columns 
Patch by eevans for CASSANDRA-2027

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080028 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-09 22:00:48 +00:00
Eric Evans b5ad6a0335 column families of expected type (JDBC tests) 
Patch by eevans for CASSANDRA-2027

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080026 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-09 22:00:40 +00:00
Eric Evans 1d50f5f378 uuid term type (hyphenated hex string) 
Patch by eevans for CASSANDRA-2027

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080021 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-09 22:00:12 +00:00
Gary Dusbabek 6edca314f0 implements getXXX methods to return values of the correct types. rearranges the JdbcDriverTest. renames SchemaDecoder. patch by gdusbabek, reviewed by eevans. CASSANDRA-2124 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1079975 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-09 20:23:10 +00:00
Jonathan Ellis ade3581fb2 merge from 0.7 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1078860 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-07 17:33:53 +00:00
Jonathan Ellis cb71747c88 add incremental_backups option 
patch by Yang Yang and jbellis for CASSANDRA-1872

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1078858 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-07 17:30:07 +00:00
Jonathan Ellis a9cbaae12d merge from 0.7 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1074329 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-24 22:33:03 +00:00
Jonathan Ellis 53286d56f0 fix supercolumn de/serialization when subcolumn comparator is different from supercolumn's 
patch by slebresne; reviewed by jbellis for CASSANDRA-2104

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1074259 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-24 19:09:42 +00:00
Gary Dusbabek 4e11242fb5 merge from 0.7 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1073896 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-23 19:32:42 +00:00
Jonathan Ellis c280e204d1 nodetool scrub 
patch by jbellis and tjake; reviewed by slebresne for CASSANDRA-2217

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1073586 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-23 03:44:26 +00:00
Jonathan Ellis c16a51827b add RowCacheTest 
patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-2173

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1072164 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-18 21:50:43 +00:00
Jonathan Ellis dc3d5bc004 merge from 0.7 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1071388 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-16 20:37:17 +00:00
Jonathan Ellis 87ea405523 fix column bloom filter deserialization 
patch by jbellis and slebresne for CASSANDRA-2165

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1071042 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-15 20:42:28 +00:00
Gary Dusbabek b1c2ce2210 configurable internode encryption. patch by rnirmal, reviewed by gdusbabek. CASSANDRA-1567 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1060890 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-19 18:10:35 +00:00
Johan Oskarsson 2c4ac98c9f Adds support for columns that act as incr/decr counters. Patch primarily by Kelvin Kakugawa with select parts from Chris Goffinet, Sylvain Lebresne, Rob Coli, Johan Oskarsson, Adam Samet, Jaakko Laine and more. Review by Jonathan Ellis and Sylvain Lebresne. CASSANDRA-1072. 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1051679 13f79535-47bb-0310-9956-ffa450edef68
 2010-12-21 22:17:09 +00:00
Jonathan Ellis 97f0480af9 revert change to test/cassandra.yaml 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1044571 13f79535-47bb-0310-9956-ffa450edef68
 2010-12-11 06:27:42 +00:00
Jonathan Ellis c48abe4c1f make NameSortTest fast to make Hudson quit bitching 
patch by jbellis

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1044570 13f79535-47bb-0310-9956-ffa450edef68
 2010-12-11 06:26:45 +00:00
Gary Dusbabek 018be3cd12 merge from 0.7 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1036924 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-19 16:28:40 +00:00
Gary Dusbabek 53b49b1180 resolve circular initializer dependency deadlock. patch by Erik Onnen and Gary Dusbabek, reviewed by Jonathan Ellis. CASSANDRA-1756 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1036922 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-19 16:26:16 +00:00
Gary Dusbabek 4680da2a57 update test yaml 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1036557 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-18 17:48:16 +00:00
Brandon Williams bb0dc512d8 Make memtable flush thresholds per-CF instead of global. Patch by Jon Hermes, reviewed by brandonwilliams for CASSANDRA-1007 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1023036 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-15 17:42:57 +00:00
Jonathan Ellis 88e660f530 rename test cassandra-rack.properties to cassandra-topology 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1022696 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-14 20:35:06 +00:00
Brandon Williams 52b7aeefe3 Point saved_caches in testing conf to build/test instead of /var/lib 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1021480 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-11 19:34:42 +00:00
Jonathan Ellis 5c44cc166e merge from 0.6 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1005317 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-07 02:24:22 +00:00